Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use Qt6 version of example project

Browse Source 
The directory structure of the Qt libraries has changed enough that
the Qt5 example project we are using for WASM cannot be built using
Qt6. This change adds an example project appropriate for use with
Qt6, and adds build jobs for Mac and Linux that build it too,
to prove that we can build the same code on all 3 platforms.
This commit is contained in:
Dave Dalcino
2022-10-10 18:18:44 -07:00
parent 09e0a7c1c5
commit 7792c192a6
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci/generate_azure_pipelines_matrices.py
View File

@@ -275,9 +275,17 @@ mac_build_jobs.extend(
linux_build_jobs.append( linux_build_jobs.append(
BuildJob("install-qt", "5.14.2", "linux", "desktop", "wasm_32", "wasm_32") BuildJob("install-qt", "5.14.2", "linux", "desktop", "wasm_32", "wasm_32")
) )
linux_build_jobs.append(
BuildJob("install-qt", "6.4.0", "linux", "desktop", "wasm_32", "wasm_32",
is_autodesktop=True, emsdk_version="sdk-3.1.14-64bit", autodesk_arch_folder="gcc_64")
)
mac_build_jobs.append( mac_build_jobs.append(
BuildJob("install-qt", "5.14.2", "mac", "desktop", "wasm_32", "wasm_32") BuildJob("install-qt", "5.14.2", "mac", "desktop", "wasm_32", "wasm_32")
) )
mac_build_jobs.append(
BuildJob("install-qt", "6.4.0", "mac", "desktop", "wasm_32", "wasm_32",
is_autodesktop=True, emsdk_version="sdk-3.1.14-64bit", autodesk_arch_folder="clang_64")
)
windows_build_jobs.append( windows_build_jobs.append(
BuildJob("install-qt", "5.14.2", "windows", "desktop", "wasm_32", "wasm_32") BuildJob("install-qt", "5.14.2", "windows", "desktop", "wasm_32", "wasm_32")
) )

BIN
ci/openglwindow_qt6.7z Normal file
View File

Binary file not shown.

14
ci/steps.yml
View File

@@ -334,7 +334,12 @@ steps:
./emsdk activate --embedded $(EMSDK_VERSION) ./emsdk activate --embedded $(EMSDK_VERSION)
source $(Build.BinariesDirectory)/emsdk/emsdk_env.sh source $(Build.BinariesDirectory)/emsdk/emsdk_env.sh
mkdir $(Build.BinariesDirectory)/tests mkdir $(Build.BinariesDirectory)/tests
(cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/openglwindow.7z) if [[ $(QT_VERSION) = 6* ]]; then
OPENGLWINDOW_7Z="openglwindow_qt6.7z"
else
OPENGLWINDOW_7Z="openglwindow.7z"
fi
(cd $(Build.BinariesDirectory)/tests; 7zr x $(Build.SourcesDirectory)/ci/$OPENGLWINDOW_7Z)
export PATH=$(QT_BINDIR):$PATH export PATH=$(QT_BINDIR):$PATH
qmake $(Build.BinariesDirectory)/tests/openglwindow qmake $(Build.BinariesDirectory)/tests/openglwindow
make make
@@ -358,16 +363,15 @@ steps:
.\emsdk_env.bat .\emsdk_env.bat
mkdir $(Build.BinariesDirectory)\tests mkdir $(Build.BinariesDirectory)\tests
cd $(Build.BinariesDirectory)\tests cd $(Build.BinariesDirectory)\tests
7z x $(Build.SourcesDirectory)\ci\openglwindow.7z
$env:Path += ";$(WIN_QT_BINDIR)" $env:Path += ";$(WIN_QT_BINDIR)"
echo "Add Qt/qmake to PATH at $(WIN_QT_BINDIR):" echo "Add Qt/qmake to PATH at $(WIN_QT_BINDIR):"
echo "$env:Path" echo "$env:Path"
if('$(QT_VERSION)' -like '6*') { if ('$(QT_VERSION)' -like '6*') {
#qmake.bat $(Build.BinariesDirectory)\tests\openglwindow 7z x $(Build.SourcesDirectory)\ci\openglwindow_qt6.7z
# inline qmake.bat file:
echo "Inlined qmake.bat command is: $(WIN_AUTODESK_QT_BINDIR)\qmake -qtconf $(WIN_QT_BINDIR)\target_qt.conf $(Build.BinariesDirectory)\tests\openglwindow" echo "Inlined qmake.bat command is: $(WIN_AUTODESK_QT_BINDIR)\qmake -qtconf $(WIN_QT_BINDIR)\target_qt.conf $(Build.BinariesDirectory)\tests\openglwindow"
$(WIN_AUTODESK_QT_BINDIR)\qmake.exe -qtconf "$(WIN_QT_BINDIR)\target_qt.conf" $(Build.BinariesDirectory)\tests\openglwindow $(WIN_AUTODESK_QT_BINDIR)\qmake.exe -qtconf "$(WIN_QT_BINDIR)\target_qt.conf" $(Build.BinariesDirectory)\tests\openglwindow
} else { } else {
7z x $(Build.SourcesDirectory)\ci\openglwindow.7z
echo "Qt5: run qmake.exe" echo "Qt5: run qmake.exe"
qmake $(Build.BinariesDirectory)\tests\openglwindow qmake $(Build.BinariesDirectory)\tests\openglwindow
} }