From c445125174c925149de7d9aee43ba04c45d58138 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 19 Nov 2021 10:23:50 +0100 Subject: [PATCH] use qt5 as qt6 breaks some functionality --- resources/scripts/github-actions/build-windows.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index ef4be7e30..77fc93ff9 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -40,7 +40,13 @@ $qt_path = "$old_pwd\qt" pip3 install -U pip pip3 install -I aqtinstall -aqt install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine qtmultimedia qt5compat qtwebchannel qtpositioning +if ($qt_version.StartsWith("6")) { + aqt install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine qtmultimedia qt5compat qtwebchannel qtpositioning +} +else { + aqt install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine +} + aqt install-src -O "$qt_path" windows desktop $qt_version --archives qtbase $qt_qmake = "$qt_path\$qt_version\msvc2019_64\bin\qmake.exe"