[Backport] More Qt5 compatibility changes

mrbean-bremen · jcfr · commit a047d41de09f · 2024-01-28T04:13:27.000-04:00
(cherry picked from commit MeVisLab/pythonqt@5bb5ae4)
diff --git a/examples/CPPPyWrapperExample/CPPPyWrapperExample.pro b/examples/CPPPyWrapperExample/CPPPyWrapperExample.pro
@@ -9,9 +9,7 @@ DESTDIR           = ../../lib
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
 
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 SOURCES +=                    \
   CPPPyWrapperExample.cpp        
diff --git a/examples/PyCPPWrapperExample/PyCPPWrapperExample.pro b/examples/PyCPPWrapperExample/PyCPPWrapperExample.pro
@@ -12,9 +12,7 @@ DESTDIR           = ../../lib
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
 
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 HEADERS += \
   CustomObjects.h
diff --git a/examples/PyCustomMetaTypeExample/PyCustomMetaTypeExample.pro b/examples/PyCustomMetaTypeExample/PyCustomMetaTypeExample.pro
@@ -12,9 +12,7 @@ DESTDIR           = ../../lib
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
   
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 HEADERS += \
   CustomObject.h
diff --git a/examples/PyDecoratorsExample/PyDecoratorsExample.pro b/examples/PyDecoratorsExample/PyDecoratorsExample.pro
@@ -12,9 +12,7 @@ DESTDIR           = ../../lib
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
   
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 HEADERS += \
   PyExampleDecorators.h
diff --git a/examples/PyGettingStarted/PyGettingStarted.pro b/examples/PyGettingStarted/PyGettingStarted.pro
@@ -14,9 +14,7 @@ CONFIG += console
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
 
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 SOURCES +=                    \
   main.cpp        
diff --git a/examples/PyGuiExample/PyGuiExample.pro b/examples/PyGuiExample/PyGuiExample.pro
@@ -11,9 +11,7 @@ mac:CONFIG -= app_bundle
 
 DESTDIR           = ../../lib
 
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
diff --git a/examples/PyLauncher/PyLauncher.pro b/examples/PyLauncher/PyLauncher.pro
@@ -11,9 +11,7 @@ mac:CONFIG -= app_bundle
 
 DESTDIR           = ../../lib
 
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
diff --git a/examples/PyScriptingConsole/PyScriptingConsole.pro b/examples/PyScriptingConsole/PyScriptingConsole.pro
@@ -15,9 +15,7 @@ include ( ../../build/common.prf )
 include ( ../../build/PythonQt.prf )  
 include ( ../../build/PythonQt_QtAll.prf )  
 
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 HEADERS +=                    \
   PyExampleObject.h             
diff --git a/src/PythonQtClassInfo.cpp b/src/PythonQtClassInfo.cpp
@@ -554,8 +554,12 @@ QStringList PythonQtClassInfo::memberList()
     }
   }
 
+#if QT_VERSION >= 0x060000
   QSet<QString> set(l.begin(), l.end());
   return set.values();
+#else
+  return QSet<QString>::fromList(l).toList();
+#endif
 }
 
 const QByteArray& PythonQtClassInfo::className() const
diff --git a/src/PythonQtClassWrapper.cpp b/src/PythonQtClassWrapper.cpp
@@ -465,9 +465,13 @@ static PyObject *PythonQtClassWrapper_getattro(PyObject *obj, PyObject *name)
 
     auto members = wrapper->classInfo()->memberList();
     auto properties = wrapper->classInfo()->propertyList();
+#if QT_VERSION >= 0x060000
     QSet<QString> completeSet(members.begin(), members.end());
     completeSet.unite(QSet<QString>(properties.begin(), properties.end()));
-
+#else
+    QSet<QString> completeSet = QSet<QString>::fromList(members);
+    completeSet.unite(QSet<QString>::fromList(properties));
+#endif
     Q_FOREACH (QString name, completeSet) {
       if (name.startsWith("py_")) {
         // do not expose internal slots
diff --git a/src/src.pro b/src/src.pro
@@ -34,7 +34,9 @@ QT += widgets core-private
 INCLUDEPATH += $$PWD
 
 macx {
+  contains(QT_MAJOR_VERSION, 6) {
     QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
+  }
 }
 
 include ( ../build/common.prf )  
diff --git a/tests/tests.pro b/tests/tests.pro
@@ -19,9 +19,7 @@ DEFINES += QT_NO_CAST_TO_ASCII
 
 gcc: QMAKE_CXXFLAGS += -pedantic -ansi -Winit-self -Wuninitialized
 
-contains(QT_MAJOR_VERSION, 5) {
-  QT += widgets
-}
+QT += widgets
 
 include ( ../build/common.prf )
 include ( ../build/PythonQt.prf )

Original file line number	Diff line number	Diff line change
`@@ -554,8 +554,12 @@ QStringList PythonQtClassInfo::memberList()`
`554`	`554`	`}`
`555`	`555`	`}`
`556`	`556`
	`557`	`+#if QT_VERSION >= 0x060000`
`557`	`558`	`QSet<QString> set(l.begin(), l.end());`
`558`	`559`	`return set.values();`
	`560`	`+#else`
	`561`	`+ return QSet<QString>::fromList(l).toList();`
	`562`	`+#endif`
`559`	`563`	`}`
`560`	`564`
`561`	`565`	`const QByteArray& PythonQtClassInfo::className() const`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ QT += widgets core-private`
`34`	`34`	`INCLUDEPATH += $$PWD`
`35`	`35`
`36`	`36`	`macx {`
	`37`	`+ contains(QT_MAJOR_VERSION, 6) {`
`37`	`38`	`QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64`
	`39`	`+ }`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`include ( ../build/common.prf )`