diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07b47e35b..67db5c462 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -246,6 +246,17 @@ jobs: qt-version: '5.11.*' # msvc-toolset: '14.16' + - qt-arch: 'win64_msvc2019_64' + python-version: '3.12' + python-arch: 'x64' + qt-version: '5.15.*' + pythonqtall-config: 'PythonQtCore PythonQtGui PythonQtMultimedia' + + - qt-arch: 'win64_msvc2017_64' + python-version: '3.6' + python-arch: 'x64' + qt-version: '5.11.*' + - qt-arch: 'win32_mingw53' python-version: '3.6' python-arch: 'x86' @@ -318,8 +329,8 @@ jobs: run: | qmake -query python --version + set PYTHONQTALL_CONFIG=${{ matrix.pythonqtall-config }} qmake CONFIG+=release CONFIG-=debug_and_release CONFIG-=debug_and_release_target ^ - "PYTHONQTALL_CONFIG=${{ matrix.pythonqtall-config }}" ^ "PYTHON_PATH=%pythonLocation%" ^ "PYTHON_VERSION=${{ steps.versions.outputs.PYTHON_VERSION_SHORT }}" ^ PythonQt.pro @@ -337,6 +348,7 @@ jobs: pythonqt_generator - name: Upload Wrappers + if: (matrix.pythonqtall-config || '') == '' uses: actions/upload-artifact@v4 with: name: wrappers_${{ matrix.qt-arch }}_${{ steps.versions.outputs.QT_VERSION_SHORT }} diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro index 666007c17..8881d00c1 100644 --- a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro +++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro @@ -27,7 +27,7 @@ isEmpty( PYTHONQTALL_CONFIG ) { } else { message("using given PythonQt_QtAll Configuration: ") message(" $${PYTHONQTALL_CONFIG}") - CONFIG += $${PYTHONQTALL_CONFIG} + eval(CONFIG += $${PYTHONQTALL_CONFIG}) } TARGET = PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-PythonXY