Merge pull request #26167 from cbjeukendrup/qt_6.2.11

Update to Qt 6.2.11 on Windows only
musescore · Jan 27, 2025 · 559bf1e · 559bf1e
2 parents 97e23fb + 5d5ea2d
commit 559bf1e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/buildscripts/ci/windows/build.bat b/buildscripts/ci/windows/build.bat
@@ -43,10 +43,9 @@ ECHO "BUILD_WIN_PORTABLE: %BUILD_WIN_PORTABLE%"
 XCOPY "C:\musescore_dependencies" %CD% /E /I /Y
 ECHO "Finished copy dependencies"
 
-
-SET "QT_DIR=C:\Qt\6.2.4"
-SET "PATH=%QT_DIR%\msvc2019_64\bin;%JACK_DIR%;%PATH%"
+SET "QT_DIR=C:\Qt\6.2.11"
 SET "JACK_DIR=C:\Program Files (x86)\Jack"
+SET "PATH=%QT_DIR%\bin;%JACK_DIR%;%PATH%"
 
 :: At the moment not compiling yet.
 SET BUILD_VST=ON 

diff --git a/buildscripts/ci/windows/make_environment.sh b/buildscripts/ci/windows/make_environment.sh
@@ -25,9 +25,9 @@ ENV_FILE=$BUILD_TOOLS/environment.sh
 mkdir -p $BUILD_TOOLS
 rm -f $ENV_FILE
 
-QT_DIR="/c/Qt/6.2.4"
+QT_DIR="/c/Qt/6.2.11"
 
-echo export PATH="${QT_DIR}/msvc2019_64/bin:\${PATH}" >> ${ENV_FILE}
+echo export PATH="${QT_DIR}/bin:\${PATH}" >> ${ENV_FILE}
 
 chmod +x "$ENV_FILE"
 

diff --git a/buildscripts/ci/windows/setup.bat b/buildscripts/ci/windows/setup.bat
@@ -39,10 +39,9 @@ MKDIR %TEMP_DIR%
 :: Install Qt
 ECHO "=== Install Qt ==="
 
-:: r2 - added websocket module
-SET "Qt_ARCHIVE=Qt624_msvc2019_64_r2.7z"
-SET "QT_DIR=C:\Qt\6.2.4"
-SET "QT_URL=https://s3.amazonaws.com/utils.musescore.org/%Qt_ARCHIVE%"
+SET "Qt_ARCHIVE=Qt-6.2.11-Windows-amd64.zip"
+SET "QT_DIR=C:\Qt\6.2.11"
+SET "QT_URL=https://github.com/cbjeukendrup/musescore_build_qt/releases/download/v12861016856/%Qt_ARCHIVE%"
 
 CALL "wget.exe" -q --show-progress --no-check-certificate "%QT_URL%" -O "%TEMP_DIR%\%Qt_ARCHIVE%"
 CALL "7z" x -y "%TEMP_DIR%\%Qt_ARCHIVE%" "-o%QT_DIR%"