diff --git a/src/gsiqt/gsiqt.pro b/src/gsiqt/gsiqt.pro index c5ec9e487..8e0f734e4 100644 --- a/src/gsiqt/gsiqt.pro +++ b/src/gsiqt/gsiqt.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS = qtbasic -greaterThan(QT_MAJOR, "4") { +greaterThan(QT_MAJOR_VERSION, 4) { SUBDIRS += qt5 qt5.depends += qtbasic } else { diff --git a/src/klayout.pri b/src/klayout.pri index bf5bde0a2..afd37597b 100644 --- a/src/klayout.pri +++ b/src/klayout.pri @@ -171,6 +171,10 @@ equals(HAVE_QT, "0") { DEFINES += HAVE_QT QT += core xml network + greaterThan(QT_MAJOR_VERSION, 5) { + QT += core5compat + } + equals(HAVE_QTBINDINGS, "1") { # sql isn't needed by the base application !equals(HAVE_QT_SQL, "0") { @@ -178,9 +182,13 @@ equals(HAVE_QT, "0") { } } - greaterThan(QT_MAJOR, "4") { + greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets gui printsupport xmlpatterns + QT += widgets gui printsupport + + lessThan(QT_MAJOR_VERSION, 6) { + QT += xmlpatterns + } equals(HAVE_QTBINDINGS, "1") { !equals(HAVE_QT_DESIGNER, "0") { diff --git a/src/klayout_main/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main/klayout_main.pro index 299493d22..695f11e88 100644 --- a/src/klayout_main/klayout_main/klayout_main.pro +++ b/src/klayout_main/klayout_main/klayout_main.pro @@ -45,7 +45,7 @@ equals(HAVE_QTBINDINGS, "1") { LIBS += -lklayout_QtUiTools } - greaterThan(QT_MAJOR, "4") { + greaterThan(QT_MAJOR_VERSION, 4) { LIBS += -lklayout_QtWidgets diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro index 965a938ea..dea36e8e7 100644 --- a/src/lay/lay/lay.pro +++ b/src/lay/lay/lay.pro @@ -207,7 +207,7 @@ equals(HAVE_QTBINDINGS, "1") { !equals(HAVE_QT_XML, "0") { LIBS += -lklayout_QtXml } - greaterThan(QT_MAJOR, "4") { + greaterThan(QT_MAJOR_VERSION, 4) { LIBS += -lklayout_QtWidgets } } diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro index e42418b9f..309e33a20 100644 --- a/src/laybasic/laybasic/laybasic.pro +++ b/src/laybasic/laybasic/laybasic.pro @@ -310,7 +310,7 @@ DEPENDPATH += $$QTBASIC_INC equals(HAVE_QTBINDINGS, "1") { LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore - greaterThan(QT_MAJOR, "4") { + greaterThan(QT_MAJOR_VERSION, 4) { LIBS += -lklayout_QtWidgets } } diff --git a/src/lib_ut.pri b/src/lib_ut.pri index 33c85999f..e80c7ba32 100644 --- a/src/lib_ut.pri +++ b/src/lib_ut.pri @@ -17,7 +17,7 @@ win32 { QMAKE_POST_LINK += $(COPY) $(DESTDIR)$(TARGET) $$DESTDIR_UT/$${TARGET}.ut } -greaterThan(QT_MAJOR, "4") { +greaterThan(QT_MAJOR_VERSION, 4) { QT += testlib } else { CONFIG += qtestlib diff --git a/src/plugins/tools/view_25d/view_25d.pro b/src/plugins/tools/view_25d/view_25d.pro index 113381a1b..138f0890d 100644 --- a/src/plugins/tools/view_25d/view_25d.pro +++ b/src/plugins/tools/view_25d/view_25d.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs contains(QT_CONFIG, opengl) { - greaterThan(QT_MAJOR, "4") { + greaterThan(QT_MAJOR_VERSION, 4) { SUBDIRS = lay_plugin unit_tests } diff --git a/src/pymod/QtCore/QtCore.pro b/src/pymod/QtCore/QtCore.pro index 2ede98c6c..9f7943d23 100644 --- a/src/pymod/QtCore/QtCore.pro +++ b/src/pymod/QtCore/QtCore.pro @@ -10,6 +10,6 @@ HEADERS += \ LIBS += -lklayout_QtCore -lklayout_QtGui -greaterThan(QT_MAJOR, "4") { +greaterThan(QT_MAJOR_VERSION, 4) { LIBS += -lklayout_QtWidgets } diff --git a/src/pymod/QtGui/QtGui.pro b/src/pymod/QtGui/QtGui.pro index 913c80b58..287a0a072 100644 --- a/src/pymod/QtGui/QtGui.pro +++ b/src/pymod/QtGui/QtGui.pro @@ -10,7 +10,7 @@ HEADERS += \ LIBS += -lklayout_QtGui -lklayout_QtCore -greaterThan(QT_MAJOR, "4") { +greaterThan(QT_MAJOR_VERSION, 4) { LIBS += -lklayout_QtWidgets } diff --git a/src/pymod/QtXml/QtXml.pro b/src/pymod/QtXml/QtXml.pro index 8b3faf3df..0e178a75e 100644 --- a/src/pymod/QtXml/QtXml.pro +++ b/src/pymod/QtXml/QtXml.pro @@ -13,6 +13,6 @@ LIBS += -lklayout_QtCore -lklayout_QtXml # Because of stupid dependency of QtCore on QtGui and this on QtWidgets: LIBS += -lklayout_QtGui -greaterThan(QT_MAJOR, "4") { +greaterThan(QT_MAJOR_VERSION, 4) { LIBS += -lklayout_QtWidgets } diff --git a/src/pymod/pymod.pro b/src/pymod/pymod.pro index 9b9b54900..7b140159f 100644 --- a/src/pymod/pymod.pro +++ b/src/pymod/pymod.pro @@ -18,7 +18,7 @@ SUBDIRS = \ QtCore \ QtGui - greaterThan(QT_MAJOR, "4") { + greaterThan(QT_MAJOR_VERSION, 4) { SUBDIRS += QtWidgets diff --git a/src/pymod/tl/tl.pro b/src/pymod/tl/tl.pro index 5d1a65433..58219f4a0 100644 --- a/src/pymod/tl/tl.pro +++ b/src/pymod/tl/tl.pro @@ -12,7 +12,7 @@ HEADERS += \ # Use this opportunity to provide the __init__.py file equals(HAVE_QTBINDINGS, "1") { - greaterThan(QT_MAJOR, "4") { + greaterThan(QT_MAJOR_VERSION, 4) { INIT_PY = $$PWD/../__init__.py.qt5 } else { INIT_PY = $$PWD/../__init__.py.qt4 diff --git a/src/tl/tl/tlStream.cc b/src/tl/tl/tlStream.cc index e0c0e1e87..dc5f1028f 100644 --- a/src/tl/tl/tlStream.cc +++ b/src/tl/tl/tlStream.cc @@ -175,8 +175,13 @@ InputStream::InputStream (const std::string &abstract_path) if (res.size () > 0) { QByteArray data; +#if QT_VERSION >= 0x60000 + if (res.compressionAlgorithm () == QResource::ZlibCompression) { + data = qUncompress ((const unsigned char *)res.data (), (int)res.size ()); +#else if (res.isCompressed ()) { data = qUncompress ((const unsigned char *)res.data (), (int)res.size ()); +#endif } else { data = QByteArray ((const char *)res.data (), (int)res.size ()); } diff --git a/src/tl/tl/tlVariant.cc b/src/tl/tl/tlVariant.cc index e34ec528d..9fb5b1353 100644 --- a/src/tl/tl/tlVariant.cc +++ b/src/tl/tl/tlVariant.cc @@ -402,9 +402,11 @@ Variant::Variant (const QVariant &v) case QVariant::RectF: operator= (tl::Variant (v.value ())); break; +#if QT_VERSION < 0x60000 case QVariant::RegExp: operator= (tl::Variant (v.value ())); break; +#endif case QVariant::Region: operator= (tl::Variant (v.value ())); break; diff --git a/src/unit_tests/unit_tests.pro b/src/unit_tests/unit_tests.pro index 741a387dc..0e01149cb 100644 --- a/src/unit_tests/unit_tests.pro +++ b/src/unit_tests/unit_tests.pro @@ -37,7 +37,7 @@ LIBS += -lklayout_gsi_test !equals(HAVE_QT_XML, "0") { LIBS += -lklayout_QtXml } - greaterThan(QT_MAJOR, "4") { + greaterThan(QT_MAJOR_VERSION, 4) { LIBS += -lklayout_QtWidgets } }