From c773f08004633f95e66f1f45560c5e58525c06b9 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 30 Mar 2023 08:16:22 +0200 Subject: [PATCH] use latest aqt --- resources/scripts/github-actions/build-linux-mac.sh | 3 ++- resources/scripts/github-actions/build-windows.ps1 | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index 2daf985c7..065abf0ac 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -54,7 +54,8 @@ else QTVERSION="6.4.3" QTBIN="$QTPATH/$QTVERSION/$QTOS/bin" - pip3 install aqtinstall + # Install "aqtinstall" from its master branch to have latest code. + pip3 install -I git+https://github.com/miurahr/aqtinstall echo "Qt bin directory is: $QTBIN" echo "Qt will be installed to: $QTPATH" diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 026eccb74..24dacdbae 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -44,8 +44,10 @@ $cmake_path = "$old_pwd\cmake-$cmake_version-windows-x86_64\bin\cmake.exe" # Download Qt itself. $qt_path = "$old_pwd\qt" + +# Install "aqtinstall" from its master branch to have latest code. pip3 install -U pip -pip3 install -I aqtinstall +pip3 install -I git+https://github.com/miurahr/aqtinstall if ($qt_version.StartsWith("6")) { aqt install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine qtimageformats qtmultimedia qt5compat qtwebchannel qtpositioning