Skip to content

Commit 559bf1e

Browse files
Merge pull request #26167 from cbjeukendrup/qt_6.2.11
Update to Qt 6.2.11 on Windows only
2 parents 97e23fb + 5d5ea2d commit 559bf1e

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

buildscripts/ci/windows/build.bat

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ ECHO "BUILD_WIN_PORTABLE: %BUILD_WIN_PORTABLE%"
4343
XCOPY "C:\musescore_dependencies" %CD% /E /I /Y
4444
ECHO "Finished copy dependencies"
4545

46-
47-
SET "QT_DIR=C:\Qt\6.2.4"
48-
SET "PATH=%QT_DIR%\msvc2019_64\bin;%JACK_DIR%;%PATH%"
46+
SET "QT_DIR=C:\Qt\6.2.11"
4947
SET "JACK_DIR=C:\Program Files (x86)\Jack"
48+
SET "PATH=%QT_DIR%\bin;%JACK_DIR%;%PATH%"
5049

5150
:: At the moment not compiling yet.
5251
SET BUILD_VST=ON

buildscripts/ci/windows/make_environment.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ ENV_FILE=$BUILD_TOOLS/environment.sh
2525
mkdir -p $BUILD_TOOLS
2626
rm -f $ENV_FILE
2727

28-
QT_DIR="/c/Qt/6.2.4"
28+
QT_DIR="/c/Qt/6.2.11"
2929

30-
echo export PATH="${QT_DIR}/msvc2019_64/bin:\${PATH}" >> ${ENV_FILE}
30+
echo export PATH="${QT_DIR}/bin:\${PATH}" >> ${ENV_FILE}
3131

3232
chmod +x "$ENV_FILE"
3333

buildscripts/ci/windows/setup.bat

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ MKDIR %TEMP_DIR%
3939
:: Install Qt
4040
ECHO "=== Install Qt ==="
4141

42-
:: r2 - added websocket module
43-
SET "Qt_ARCHIVE=Qt624_msvc2019_64_r2.7z"
44-
SET "QT_DIR=C:\Qt\6.2.4"
45-
SET "QT_URL=https://s3.amazonaws.com/utils.musescore.org/%Qt_ARCHIVE%"
42+
SET "Qt_ARCHIVE=Qt-6.2.11-Windows-amd64.zip"
43+
SET "QT_DIR=C:\Qt\6.2.11"
44+
SET "QT_URL=https://github.com/cbjeukendrup/musescore_build_qt/releases/download/v12861016856/%Qt_ARCHIVE%"
4645

4746
CALL "wget.exe" -q --show-progress --no-check-certificate "%QT_URL%" -O "%TEMP_DIR%\%Qt_ARCHIVE%"
4847
CALL "7z" x -y "%TEMP_DIR%\%Qt_ARCHIVE%" "-o%QT_DIR%"

0 commit comments

Comments
 (0)