Qt6 Compatibilty

.vimrc

@@ -0,0 +1 @@
+set expandtab

COPYING

@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 

build/common.prf

@@ -25,54 +25,39 @@ PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp
   PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_$${QT_MAJOR_VERSION}$${QT_MINOR_VERSION}
 
   !exists($$PYTHONQT_GENERATED_PATH) {
-    contains( QT_MAJOR_VERSION, 5 ) {
-      contains( QT_MINOR_VERSION, 10 ) { 
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_56
-      }
-      else:contains( QT_MINOR_VERSION, 11 ) { 
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511
-      }
-      else:contains( QT_MINOR_VERSION, 12 ) {
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511
-      }
-      else:contains( QT_MINOR_VERSION, 1 ) {
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_50
-      }
-      else:contains( QT_MINOR_VERSION, 2 ) {
+    # For Qt5 we know that the older generated wrappers work with the later
+    # versions, even (apparently) Qt5.15, so:
+    equals(QT_MAJOR_VERSION, 5) {
+      # Qt5: have 5.0, 5.3, 5.4, 5.6 and 5.11 at present:
+      lessThan(QT_MINOR_VERSION, 3) { # 5.1, 5.2
         PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_50
       }
-  	  else:contains( QT_MINOR_VERSION, 3 ) { 
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_53
-  	  }
-  	  else:contains( QT_MINOR_VERSION, 4 ) { 
+      else: lessThan(QT_MINOR_VERSION, 6) { # 5.5
         PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_54
-  	  }
-      else:contains( QT_MINOR_VERSION, 5 ) { 
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_54
-  	  }
-      else:contains( QT_MINOR_VERSION, 6 ) { 
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_56
       }
-      else:contains( QT_MINOR_VERSION, 7 ) { 
+      else: lessThan(QT_MINOR_VERSION, 11) { # 5.7, 5.8, 5.9, 5.10
         PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_56
       }
-      else:contains( QT_MINOR_VERSION, 8 ) { 
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_56
-      }
-      else:contains( QT_MINOR_VERSION, 9 ) { 
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_56
-      }
-      else {
-        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_56
+      else { # >5.11
+        # LATEST Qt5 generated files:
+        PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511
       }
     }
+
+    !exists($$PYTHONQT_GENERATED_PATH) {
+      error("No generated sources exist for Qt$${QT_VERSION}")
+    }
   }
 }
 
+!build_pass {
+  message("Qt version: Qt$${QT_VERSION}")
+  message("Using generated sources files from $${PYTHONQT_GENERATED_PATH}")
+}
+
 VERSION = 3.2.0
-greaterThan(QT_MAJOR_VERSION, 5) | greaterThan(QT_MINOR_VERSION, 9): CONFIG += c++11
 win32: CONFIG += skip_target_version_ext
-gcc|win32-clang-msvc:QMAKE_CXXFLAGS += -Wno-deprecated-declarations -Wuninitialized -Winit-self -ansi -pedantic
+gcc|win32-clang-msvc:QMAKE_CXXFLAGS += -Wno-deprecated-declarations -Wuninitialized -Winit-self -pedantic
 win32-clang-msvc:QMAKE_CXXFLAGS += -Wno-unused-command-line-argument
 #Do not issue warning to system includes
 gcc:!isEmpty(QT_INSTALL_HEADERS): QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]

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        

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

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

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

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        

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 )  

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 )  

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             

generator/LICENSE.LGPL

@@ -1,4 +1,4 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
 
  The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
  Contact: Nokia Corporation ([email protected])
@@ -8,8 +8,8 @@
 
 -------------------------------------------------------------------------
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -20,7 +20,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -122,7 +122,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -442,7 +442,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -465,7 +465,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 

generator/abstractmetabuilder.cpp

@@ -54,7 +54,9 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QTextCodec>
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+#   include <QtCore/QTextCodec>
+#endif
 #include <QtCore/QTextStream>
 #include <QtCore/QVariant>
 
@@ -376,15 +378,9 @@ void AbstractMetaBuilder::fixQObjectForScope(TypeDatabase *types,
     }
 }
 
-static bool class_less_than(AbstractMetaClass *a, AbstractMetaClass *b)
-{
-    return a->name() < b->name();
-}
-
-
 void AbstractMetaBuilder::sortLists()
 {
-   qSort(m_meta_classes.begin(), m_meta_classes.end(), class_less_than);
+   m_meta_classes.sort();
    for (AbstractMetaClass *cls :  m_meta_classes) {
         cls->sortFunctions();
    }
@@ -400,7 +396,10 @@ bool AbstractMetaBuilder::build()
         return false;
 
     QTextStream stream(&file);
-    stream.setCodec(QTextCodec::codecForName("UTF-8"));
+#   if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+        stream.setCodec(QTextCodec::codecForName("UTF-8"));
+        /* Note required in Qt6: see the same call in asttoxml.cpp */
+#   endif
     QByteArray contents = stream.readAll().toUtf8();
     file.close();
 
@@ -971,7 +970,7 @@ AbstractMetaEnum *AbstractMetaBuilder::traverseEnum(EnumModelItem enum_item, Abs
         meta_enum->addEnumValue(meta_enum_value);
 
         ReportHandler::debugFull("   - " + meta_enum_value->name() + " = "
-                                 + meta_enum_value->value());
+                                 + QString::number(meta_enum_value->value()));
 
         // Add into global register...
         if (enclosing)
@@ -1444,7 +1443,13 @@ void AbstractMetaBuilder::traverseEnums(ScopeModelItem scope_item, AbstractMetaC
 {
     EnumList enums = scope_item->enums();
     for (EnumModelItem enum_item :  enums) {
-        AbstractMetaEnum *meta_enum = traverseEnum(enum_item, meta_class, QSet<QString>::fromList(enumsDeclarations));
+        AbstractMetaEnum *meta_enum = traverseEnum(enum_item, meta_class,
+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
+            QSet<QString>::fromList(enumsDeclarations)
+#else
+            QSet<QString>(enumsDeclarations.begin(), enumsDeclarations.end())
+#endif
+        );
         if (meta_enum) {
             meta_enum->setOriginalAttributes(meta_enum->attributes());
             meta_class->addEnum(meta_enum);
@@ -1476,6 +1481,19 @@ AbstractMetaFunction *AbstractMetaBuilder::traverseFunction(FunctionModelItem fu
       return 0;
     }
 
+    if (function_item->isAuto()) {
+        /*TODO: it might work just to output 'auto', but this would require
+         * understanding what AbstractMetabuild::translateType() does and
+         * changing it.  auto is only used once anyway.
+         */
+        ReportHandler::warning(QString("%1: skipping auto function type '%2'")
+                .arg(function_name)
+                .arg(function_item->type().toString()));
+        m_rejected_functions[class_name + "::" + function_name + " " + function_item->type().toString()] =
+                UnmatchedReturnType;
+        return 0;
+    }
+
     QString cast_type;
 
     if (function_name.startsWith("operator")) {
@@ -1491,6 +1509,8 @@ AbstractMetaFunction *AbstractMetaBuilder::traverseFunction(FunctionModelItem fu
 
     AbstractMetaFunction *meta_function = createMetaFunction();
     meta_function->setConstant(function_item->isConstant());
+    meta_function->setConstexpr(function_item->isConstexpr());
+    meta_function->setAuto(function_item->isAuto());
     meta_function->setException(function_item->exception());
 
     ReportHandler::debugMedium(QString(" - %2()").arg(function_name));
@@ -1694,10 +1714,12 @@ AbstractMetaType *AbstractMetaBuilder::translateType(const TypeInfo &_typei, boo
             //newInfo.setArguments(typei.arguments());
             newInfo.setIndirections(typei.indirections());
             newInfo.setConstant(typei.isConstant());
+            newInfo.setConstexpr(typei.isConstexpr());
             newInfo.setFunctionPointer(typei.isFunctionPointer());
             newInfo.setQualifiedName(typei.qualifiedName());
             newInfo.setReference(typei.isReference());
             newInfo.setVolatile(typei.isVolatile());
+            newInfo.setMutable(typei.isMutable());
 
             AbstractMetaType *elementType = translateType(newInfo, ok);
             if (!(*ok))
@@ -2461,7 +2483,7 @@ AbstractMetaClassList AbstractMetaBuilder::classesTopologicalSorted() const
     AbstractMetaClassList res;
 
     AbstractMetaClassList classes = m_meta_classes;
-    qSort(classes);
+    classes.sort();
 
     QSet<AbstractMetaClass*> noDependency;
     QHash<AbstractMetaClass*, QSet<AbstractMetaClass* >* > hash;

generator/abstractmetabuilder.h

@@ -127,7 +127,7 @@ class AbstractMetaBuilder
     bool isEnum(const QStringList &qualified_name);
 
     void fixQObjectForScope  (TypeDatabase *types, 
-			      NamespaceModelItem item);
+                              NamespaceModelItem item);
 
     // QtScript
     QSet<QString> qtMetaTypeDeclaredTypeNames() const