Skip to content

Commit

Permalink
Improve PYTHONQTALL_CONFIG env var handling for CMD (#214)
Browse files Browse the repository at this point in the history
* Parse PYTHONQTALL_CONFIG value
* Add test for env var PYTHONQTALL_CONFIG
* MSVC2019 for Qt5.15 test
  • Loading branch information
iakov authored May 8, 2024
1 parent c3d7220 commit 1c6cb9f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion extensions/PythonQt_QtAll/PythonQt_QtAll.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1c6cb9f

Please sign in to comment.