WIP

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 {

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") {

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
 

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
   }
 }

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
   }
 }

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

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
   }
 

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
 }

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
 }
 

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
 }

src/pymod/pymod.pro

@@ -18,7 +18,7 @@ SUBDIRS = \
       QtCore \
       QtGui
 
-    greaterThan(QT_MAJOR, "4") {
+    greaterThan(QT_MAJOR_VERSION, 4) {
 
       SUBDIRS += QtWidgets
 

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

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 ());
       }

src/tl/tl/tlVariant.cc

@@ -402,9 +402,11 @@ Variant::Variant (const QVariant &v)
   case QVariant::RectF:
     operator= (tl::Variant (v.value<QRectF> ()));
     break;
+#if QT_VERSION < 0x60000
   case QVariant::RegExp:
     operator= (tl::Variant (v.value<QRegExp> ()));
     break;
+#endif
   case QVariant::Region:
     operator= (tl::Variant (v.value<QRegion> ()));
     break;

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
     }
   }