Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Qt 6.2.11 on Windows only #26167

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −9
Open

Update to Qt 6.2.11 on Windows only #26167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions buildscripts/ci/windows/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions buildscripts/ci/windows/make_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
7 changes: 3 additions & 4 deletions buildscripts/ci/windows/setup.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Expand Down