File tree Expand file tree Collapse file tree 2 files changed +14
-2
lines changed
extensions/PythonQt_QtAll Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -246,6 +246,17 @@ jobs:
246246 qt-version : ' 5.11.*'
247247# msvc-toolset: '14.16'
248248
249+ - qt-arch : ' win64_msvc2019_64'
250+ python-version : ' 3.12'
251+ python-arch : ' x64'
252+ qt-version : ' 5.15.*'
253+ pythonqtall-config : ' PythonQtCore PythonQtGui PythonQtMultimedia'
254+
255+ - qt-arch : ' win64_msvc2017_64'
256+ python-version : ' 3.6'
257+ python-arch : ' x64'
258+ qt-version : ' 5.11.*'
259+
249260 - qt-arch : ' win32_mingw53'
250261 python-version : ' 3.6'
251262 python-arch : ' x86'
@@ -318,8 +329,8 @@ jobs:
318329 run : |
319330 qmake -query
320331 python --version
332+ set PYTHONQTALL_CONFIG=${{ matrix.pythonqtall-config }}
321333 qmake CONFIG+=release CONFIG-=debug_and_release CONFIG-=debug_and_release_target ^
322- "PYTHONQTALL_CONFIG=${{ matrix.pythonqtall-config }}" ^
323334 "PYTHON_PATH=%pythonLocation%" ^
324335 "PYTHON_VERSION=${{ steps.versions.outputs.PYTHON_VERSION_SHORT }}" ^
325336 PythonQt.pro
@@ -337,6 +348,7 @@ jobs:
337348 pythonqt_generator
338349
339350 - name : Upload Wrappers
351+ if : (matrix.pythonqtall-config || '') == ''
340352 uses : actions/upload-artifact@v4
341353 with :
342354 name : wrappers_${{ matrix.qt-arch }}_${{ steps.versions.outputs.QT_VERSION_SHORT }}
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ isEmpty( PYTHONQTALL_CONFIG ) {
2727} else {
2828 message ("using given PythonQt_QtAll Configuration: " )
2929 message (" $${PYTHONQTALL_CONFIG}" )
30- CONFIG += $${PYTHONQTALL_CONFIG}
30+ eval( CONFIG += $${PYTHONQTALL_CONFIG})
3131}
3232
3333TARGET = PythonQt_QtAll-Qt $${QT_MAJOR_VERSION }-PythonXY
You can’t perform that action at this time.
0 commit comments