Switch to Qt 6.2.9

Resolves: #23505
Resolves: #23970

Author: cbjeukendrup

buildscripts/ci/linux/setup.sh

@@ -128,14 +128,14 @@ sudo apt-get install -y --no-install-recommends \
 ##########################################################################
 
 # Get newer Qt (only used cached version if it is the same)
-qt_version="624"
+qt_version="6.2.9"
 qt_dir="$BUILD_TOOLS/Qt/${qt_version}"
 if [[ ! -d "${qt_dir}" ]]; then
   mkdir -p "${qt_dir}"
-  qt_url="https://s3.amazonaws.com/utils.musescore.org/Qt${qt_version}_gcc64.7z"
-  wget -q --show-progress -O qt.7z "${qt_url}"
-  7z x -y qt.7z -o"${qt_dir}"
-  rm qt.7z
+  qt_url="https://github.com/cbjeukendrup/musescore_build_qt/releases/download/Qt_${qt_version}_20240817T110208/Qt-${qt_version}-Linux-amd64.zip"
+  wget -q --show-progress -O qt.zip "${qt_url}"
+  7z x -y qt.zip -o"${qt_dir}"
+  rm qt.zip
 fi
 
 echo export PATH="${qt_dir}/bin:\${PATH}" >> ${ENV_FILE}

buildscripts/ci/macos/setup.sh

@@ -40,15 +40,15 @@ tar xf musescore_deps_macos.tar.gz -C $HOME/musescore_deps_macos
 rm musescore_deps_macos.tar.gz
 
 # Qt
-export QT_SHORT_VERSION=6.2.4
+export QT_SHORT_VERSION=6.2.9
 echo "Download Qt $QT_SHORT_VERSION"
 export QT_PATH=$HOME/Qt/$QT_SHORT_VERSION/
-export PATH=$PATH:$QT_PATH/macos/bin
+export PATH=$PATH:$QT_PATH/bin
 echo "PATH=$PATH" >> $GITHUB_ENV
-wget -nv -O qt.7z https://s3.amazonaws.com/utils.musescore.org/Qt624_mac.7z
+wget -nv -O qt.zip https://github.com/cbjeukendrup/musescore_build_qt/releases/download/Qt_6.2.9_20240817T110208/Qt-6.2.9-macOS.zip
 mkdir -p $QT_PATH
-7z x -y qt.7z -o$QT_PATH
-rm qt.7z
+7z x -y qt.zip -o$QT_PATH
+rm qt.zip
 
 # VST SDK
 echo "Download VST SDK"

buildscripts/ci/windows/build.bat

@@ -44,9 +44,9 @@ 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.9"
 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 

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.9"
 
-echo export PATH="${QT_DIR}/msvc2019_64/bin:\${PATH}" >> ${ENV_FILE}
+echo export PATH="${QT_DIR}/bin:\${PATH}" >> ${ENV_FILE}
 
 chmod +x "$ENV_FILE"
 

buildscripts/ci/windows/setup.bat

@@ -39,9 +39,9 @@ MKDIR %TEMP_DIR%
 :: Install Qt
 ECHO "=== Install Qt ==="
 
-SET "Qt_ARCHIVE=Qt624_msvc2019_64.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.9-Windows-amd64.zip"
+SET "QT_DIR=C:\Qt\6.2.9"
+SET "QT_URL=https://github.com/cbjeukendrup/musescore_build_qt/releases/download/Qt_6.2.9_20240817T110208/%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%"