Fix PythonQt build under Qt 6.9

- add Qt 6.9 to CI

Author: mrbean-bremen

.github/workflows/build_latest.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu', 'windows']
-        qt-version: [ '5.12.*', '5.15.*', '6.7.*', '6.8.*' ]
+        qt-version: [ '5.12.*', '5.15.*', '6.8.*', '6.9.*' ]
         python-version: [ '3.12' ]
     runs-on: ${{ matrix.os }}-latest
     steps:
@@ -36,7 +36,7 @@ jobs:
       with:
         version: ${{ matrix.qt-version }}
         modules: ${{startsWith(matrix.qt-version, '6') && 'qt5compat qtscxml qtpositioning qtwebchannel qtmultimedia qtwebengine' || '' }}
-        arch: ${{ (matrix.os == 'ubuntu' && (startsWith(matrix.qt-version, '5') && 'gcc_64' || 'linux_gcc_64')) || startsWith(matrix.qt-version, '5.12') && 'win64_msvc2017_64' || startsWith(matrix.qt-version, '6.8') && 'win64_msvc2022_64' || 'win64_msvc2019_64' }}
+        arch: ${{ (matrix.os == 'ubuntu' && (startsWith(matrix.qt-version, '5') && 'gcc_64' || 'linux_gcc_64')) || startsWith(matrix.qt-version, '5.12') && 'win64_msvc2017_64' || startsWith(matrix.qt-version, '6') && 'win64_msvc2022_64' || 'win64_msvc2019_64' }}
 
     - name: Setup Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5

generator/shellgenerator.cpp

@@ -199,7 +199,7 @@ void ShellGenerator::writeFunctionArguments(QTextStream &s,
               if (pos > 0) {
                 QString typeName = expr.left(pos);
                 AbstractMetaEnum* enumType = findEnumTypeOfClass(_currentScope, typeName);
-                if (enumType && enumType->typeEntry()->isEnumClass()) {
+                if (enumType) {
                   // prepend original class name, otherwise the new enum type from the wrapper will be used,
                   // which is not compatible
                   qualifier = _currentScope->name();

generator/typesystem_core.xml

@@ -239,7 +239,7 @@
   <primitive-type name="qptrdiff"/>
   <primitive-type name="qsizetype"/>
   <primitive-type name="Qt::Disambiguated_t"/>
-  
+
   <rejection class="qfloat16"/>  <!-- only used in QRgbaFloat template and QCborStreamReader/Writer so far -->
 
   <value-type name="QModelIndex"/>
@@ -1133,6 +1133,14 @@ public:
     </inject-code>
   </value-type>
 
+  <value-type name="QJsonValue" since-version="6.9">
+<!-- workaround to handle using declaration for an enum in another class -->
+<!-- (currently not handled by the generator, handling needs to be added if this happens more often) -->
+    <inject-code class="pywrap-h">
+public:
+    using JsonFormat = QJsonDocument::JsonFormat;
+    </inject-code>
+  </value-type>
 
   <value-type name="QBitArray">
     <modify-function signature="operator[](int)" remove="all"/>
@@ -2053,7 +2061,7 @@ public:
     </inject-code>
   </object-type>
   <rejection class="QCborStreamReader::StringResult" since-version="6.7"/>
-  
+
   <object-type name="QCborValue" since-version="5.12">
     <modify-function signature="QCborValue(QCborTag, const QCborValue&amp;)" remove="all"/>
     <modify-function signature="tag(QCborTag)const" remove="all"/>