Mercurial > mxe-octave

annotate src/gnuplot-3-qt6-native.patch @ 7225:48e5a8cd5086 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt6: Update to version 6.7.1 * qt6-qtbase.mk: Update version and checksum. Remove no longer recognized configure switch. * qt6-qtbase-1-fixes.patch: Adjust patch for reorganized CMake files. Remove hunk that is no longer needed. * qt6-qtbase-2-6.7.0-opengl-header.patch: Add new patch. * dist-files.mk: Add new file to list. * qt6-qt5compat.mk, qt6-qtimageformats.mk, qt6-qtsvg.mk, qt6-qttools.mk, qt6-qttranslations.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 31 May 2024 10:58:54 +0200
parents 414e3f556594
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6894
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From e458b88e481e8af4ef2d97c9af79fdf40e40ed81 Mon Sep 17 00:00:00 2001
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: Ethan A Merritt <merritt@u.washington.edu>
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Sun, 30 Jul 2023 11:37:14 -0700
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH] configure: Check for Qt6, fall back to Qt5
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 Note: requires C++ -std=c++17
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 Note: requires Qt6 compatibility module Core5Compat
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 for class QTextCodec
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 codecForLocale() codecForMib() fromUnicode() toUnicode()
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 in order to support non-utf8 encodings (gnuplot's "set encoding").
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 This is not entirely satisfactory, since there is apparently not
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 a guarantee from Qt that the compatibility modules will continue
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 to be available in the future.
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 ./configure --with-qt=qt4 is still accepted but I no longer have
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 the Qt4 libraries installed to confirm that it works.
7140
414e3f556594 gnuplot: Adapt patch for newer versions of Qt6.
Markus Mützel <markus.muetzel@gmx.de>
parents: 6894
diff changeset
19
414e3f556594 gnuplot: Adapt patch for newer versions of Qt6.
Markus Mützel <markus.muetzel@gmx.de>
parents: 6894
diff changeset
20
414e3f556594 gnuplot: Adapt patch for newer versions of Qt6.
Markus Mützel <markus.muetzel@gmx.de>
parents: 6894
diff changeset
21 Adapted by MXE Octave for newer versions of Qt6 which seem to have
414e3f556594 gnuplot: Adapt patch for newer versions of Qt6.
Markus Mützel <markus.muetzel@gmx.de>
parents: 6894
diff changeset
22 a different dependency between modules.
6894
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 ---
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 configure.ac | 53 ++++++++++++++++++++++----------
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 src/qtterminal/qt_conversion.cpp | 9 ++++++
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 2 files changed, 45 insertions(+), 17 deletions(-)
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 diff --git a/configure.ac b/configure.ac
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 index 3f98c46d0..ca09c31d2 100644
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 --- a/configure.ac
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 +++ b/configure.ac
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 @@ -1065,29 +1065,48 @@ if test "${enable_qt}" = yes ; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 enable_qt_ok=no
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 - dnl First check for Qt5
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 - if test "x${with_qt}" = "xqt5"; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 - try_qt4=no
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 - else
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 + dnl Qt4 only by special request
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 + if test "x${with_qt}" = "xqt4"; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 try_qt4=yes
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 + else
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 + try_qt4=no
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 +
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 if test "x${with_qt}" != "xqt4"; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 - PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 + AC_MSG_CHECKING([Checking for Qt6 support libraries])
7140
414e3f556594 gnuplot: Adapt patch for newer versions of Qt6.
Markus Mützel <markus.muetzel@gmx.de>
parents: 6894
diff changeset
50 + PKG_CHECK_MODULES_NOFAIL(QT, [Qt6Core Qt6Gui Qt6Network Qt6Svg Qt6Widgets Qt6PrintSupport Qt6Core5Compat])
6894
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 if test $pkg_failed = no; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 - try_qt4=no
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 - QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core`
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 - if test "x${QT5LOC}" != "x"; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55 - UIC=${QT5LOC}/uic
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56 - MOC=${QT5LOC}/moc
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
57 - RCC=${QT5LOC}/rcc
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
58 - LRELEASE=${QT5LOC}/lrelease
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
59 + QT6LOC=`$PKG_CONFIG --variable=host_bins Qt6Core`
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
60 + if test "x${QT6LOC}" != "x"; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
61 + UIC=${QT6LOC}/uic
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
62 + MOC=${QT6LOC}/moc
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
63 + RCC=${QT6LOC}/rcc
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
64 + LRELEASE=${QT6LOC}/lrelease
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
65 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
66 CXXFLAGS="$CXXFLAGS -fPIC"
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
67 + AC_MSG_RESULT([The Qt terminal will use Qt6.])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
68 + QTVER="6"
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
69 + else
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
70 + AC_MSG_CHECKING([Checking for Qt5 support libraries])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
71 + PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
72 + if test $pkg_failed = no; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
73 + QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core`
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
74 + if test "x${QT5LOC}" != "x"; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
75 + UIC=${QT5LOC}/uic
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
76 + MOC=${QT5LOC}/moc
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
77 + RCC=${QT5LOC}/rcc
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
78 + LRELEASE=${QT5LOC}/lrelease
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
79 + fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
80 + CXXFLAGS="$CXXFLAGS -fPIC"
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
81 + AC_MSG_RESULT([The Qt terminal will use Qt5.])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
82 + QTVER="5"
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
83 + fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
84 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
85 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
86
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
87 - dnl No Qt5, check for Qt4.5 or greater
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
88 - if test ${try_qt4} != no; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
89 + dnl Explicit request for qt4
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
90 + if test ${try_qt4} = yes; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
91 + AC_MSG_CHECKING([Checking for Qt4 support])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
92 PKG_CHECK_MODULES_NOFAIL(QT, [QtCore >= 4.5 QtGui >= 4.5 QtNetwork >= 4.5 QtSvg >= 4.5])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
93 if test $pkg_failed != no; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
94 enable_qt_ok=no
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
95 @@ -1170,9 +1189,6 @@ if test "${enable_qt}" = yes ; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
96 AC_MSG_WARN([The Qt terminal will use Qt4.])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
97 QTVER="4"
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
98 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
99 - else
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
100 - AC_MSG_WARN([The Qt terminal will use Qt5.])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
101 - QTVER="5"
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
102 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
103 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
104
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
105 @@ -1366,6 +1382,9 @@ if test "$enable_qt_ok" = yes; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
106 if test "$QTVER" = 5; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
107 AC_MSG_RESULT([ Qt : yes (qt5)])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
108 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
109 + if test "$QTVER" = 6; then
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
110 + AC_MSG_RESULT([ Qt : yes (qt6)])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
111 + fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
112 else
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
113 AC_MSG_RESULT([ Qt : no (use --with-qt or --with-qt=qt4 to enable])
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
114 fi
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
115 diff --git a/src/qtterminal/qt_conversion.cpp b/src/qtterminal/qt_conversion.cpp
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
116 index cf8a20930..a50d357b8 100644
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
117 --- a/src/qtterminal/qt_conversion.cpp
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
118 +++ b/src/qtterminal/qt_conversion.cpp
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
119 @@ -41,6 +41,15 @@
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
120 * under either the GPL or the gnuplot license.
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
121 ]*/
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
122
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
123 +/*
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
124 + * Qt6 no longer supports other 8-bit encodings natively, relegating the
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
125 + * QTextCodec functions to a compatibility module Core5Compat.
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
126 + * FIXME: roll our own?
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
127 + */
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
128 +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
129 + #include <QTextCodec>
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
130 +#endif
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
131 +
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
132 static QColor qt_colorList[12] =
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
133 {
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
134 Qt::white,
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
135 --
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
136 2.38.0.windows.1
7b5dcd048534 gnuplot: Support native build with Qt6
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
137