Skip to content

Commit

Permalink
Switch to Qt 6.2.9 on Windows only
Browse files Browse the repository at this point in the history
On macOS, it causes a problem with disappearing texts, which will take more time to fix. Also, the issues solved by this update affect other OSs more than macOS.

On Linux, it causes crashes whenever OS dialogs are involved (open/save, color picker).

Resolves only on Windows: #23505
Resolves not yet: #23970
Resolves: #24232
Resolves: #24579
  • Loading branch information
cbjeukendrup committed Sep 29, 2024
1 parent dfcfc94 commit 326a227
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions buildscripts/ci/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions buildscripts/ci/windows/make_environment.sh
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.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"

Expand Down
7 changes: 3 additions & 4 deletions buildscripts/ci/windows/setup.bat
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.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-491b27cc6fa2d9b8cc0b37cdb4cd2b9eae6dea57/%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

0 comments on commit 326a227

Please sign in to comment.