fix: Ensure typesystem settings can be loaded from Qt resources and update CI workflow

.github/workflows/build.yml

@@ -73,9 +73,9 @@ jobs:
         # workaround to allow to find the Qt include dirs for installed standard qt packages
         mkdir /usr/include/qt5; ln -s /usr/include/x86_64-linux-gnu/qt5 /usr/include/qt5/include
         export QTDIR=/usr/include/qt5
-        cd generator
         UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
-        ./pythonqt_generator
+        ./generator/pythonqt_generator \
+           --output-directory=.
 
     - name: Build PythonQt (exclude_generator)
       run: |
@@ -169,10 +169,11 @@ jobs:
     - name: Generate Wrappers
       run: |
         export QTDIR=/usr/include/qt5
-        cd generator
         # Specify "/usr/include" so that header "bits/wordsize.h" included from "qconfig.h" is found.
         # See https://git.rockylinux.org/staging/rpms/qt5-qtbase/-/blob/r8/SOURCES/qconfig-multilib.h
-        ./pythonqt_generator --include-paths=/usr/include
+        ./generator/pythonqt_generator \
+          --include-paths=/usr/include \
+          --output-directory=.
 
     - name: Build PythonQt (exclude_generator)
       run: |
@@ -270,9 +271,9 @@ jobs:
 
     - name: Generate Wrappers
       run: |
-        cd generator
         UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
-        ./pythonqt_generator
+        ./generator/pythonqt_generator \
+          --output-directory=.
 
     - name: Build PythonQt (exclude_generator)
       run: |
@@ -397,9 +398,9 @@ jobs:
     - name: Generate Wrappers
       shell: cmd
       run: |
-        cd generator
         set QTDIR=%QT_ROOT_DIR%
-        pythonqt_generator
+        generator\pythonqt_generator ^
+          --output-directory=.
 
     - name: Build PythonQt (exclude_generator)
       shell: cmd

.github/workflows/build_latest.yml

@@ -85,11 +85,11 @@ jobs:
     - name: Generate Wrappers
       shell: bash
       run: |
-        cd generator
         QTDIR="$QT_ROOT_DIR" \
         UBSAN_OPTIONS="halt_on_error=1" \
         ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
-        ./pythonqt_generator
+        ./generator/pythonqt_generator \
+           --output-directory=.
 
     - name: Upload Wrappers
       uses: actions/upload-artifact@v4

generator/build_all.txt

@@ -1,17 +1,17 @@
 <typesystem>
-  <load-typesystem name="typesystem_general.xml" generate="no" />
-  <load-typesystem name="typesystem_core.xml" generate="yes" />
-  <load-typesystem name="typesystem_gui.xml" generate="yes" />
-  <load-typesystem name="typesystem_sql.xml" generate="yes" />
-  <load-typesystem name="typesystem_opengl.xml" generate="yes" />
-  <load-typesystem name="typesystem_svg.xml" generate="yes" />
-  <load-typesystem name="typesystem_network.xml" generate="yes" />
-  <load-typesystem name="typesystem_xml.xml" generate="yes" />
-  <load-typesystem name="typesystem_webkit.xml" generate="yes" />
-  <load-typesystem name="typesystem_webenginewidgets.xml" generate="yes" />
-  <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
-  <load-typesystem name="typesystem_uitools.xml" generate="yes" />
-  <load-typesystem name="typesystem_multimedia.xml" generate="yes" />
-  <load-typesystem name="typesystem_qml.xml" generate="yes" />
-  <load-typesystem name="typesystem_quick.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_general.xml" generate="no" />
+  <load-typesystem name=":/trolltech/generator/typesystem_core.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_gui.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_sql.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_opengl.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_svg.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_network.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_xml.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_webkit.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_webenginewidgets.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_xmlpatterns.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_uitools.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_multimedia.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_qml.xml" generate="yes" />
+  <load-typesystem name=":/trolltech/generator/typesystem_quick.xml" generate="yes" />
 </typesystem>

generator/generator.qrc

@@ -1,20 +1,21 @@
 <!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/trolltech/generator/">
+<qresource prefix="/trolltech/generator">
 <file>qtscript_masterinclude.h</file>
 <file>build_all.txt</file>
-<file alias="typesystem_general.txt">typesystem_general.xml</file>
-<file alias="typesystem_core.txt">typesystem_core.xml</file>
-<file alias="typesystem_gui.txt">typesystem_gui.xml</file>
-<file alias="typesystem_sql.txt">typesystem_sql.xml</file>
-<file alias="typesystem_opengl.txt">typesystem_opengl.xml</file>
-<file alias="typesystem_svg.txt">typesystem_svg.xml</file>
-<file alias="typesystem_network.txt">typesystem_network.xml</file>
-<file alias="typesystem_xml.txt">typesystem_xml.xml</file>
-<file alias="typesystem_webkit.txt">typesystem_webkit.xml</file>
-<file alias="typesystem_webenginewidgets.txt">typesystem_webenginewidgets.xml</file>
-<file alias="typesystem_xmlpatterns.txt">typesystem_xmlpatterns.xml</file>
-<file alias="typesystem_multimedia.txt">typesystem_multimedia.xml</file>
-<file alias="typesystem_qml.txt">typesystem_qml.xml</file>
-<file alias="typesystem_quick.txt">typesystem_quick.xml</file>
+<file>typesystem_general.xml</file>
+<file>typesystem_core.xml</file>
+<file>typesystem_gui.xml</file>
+<file>typesystem_sql.xml</file>
+<file>typesystem_opengl.xml</file>
+<file>typesystem_svg.xml</file>
+<file>typesystem_network.xml</file>
+<file>typesystem_xml.xml</file>
+<file>typesystem_webkit.xml</file>
+<file>typesystem_webenginewidgets.xml</file>
+<file>typesystem_xmlpatterns.xml</file>
+<file>typesystem_uitools.xml</file>
+<file>typesystem_multimedia.xml</file>
+<file>typesystem_qml.xml</file>
+<file>typesystem_quick.xml</file>
 </qresource>
 </RCC>