From 4c01e65ce4b16303db80a420b04f55b8120a4bbc Mon Sep 17 00:00:00 2001 From: Casper Jeukendrup <48658420+cbjeukendrup@users.noreply.github.com> Date: Mon, 30 Mar 2026 14:51:02 +0200 Subject: [PATCH] Update Qt to 6.11.0 --- .github/workflows/build_all.yml | 16 +- .github/workflows/build_backend.yml | 4 +- .github/workflows/build_linux.yml | 4 +- .github/workflows/build_linux_arm32.yml | 178 ------------------ .github/workflows/build_macos.yml | 20 +- .github/workflows/build_wasm.yml | 4 +- .github/workflows/build_windows.yml | 8 +- .github/workflows/check_unit_tests.yml | 4 +- .github/workflows/check_visual_tests.yml | 8 +- .github/workflows/deploy.yml | 2 +- .github/workflows/translate_lupdate.yml | 2 +- .github/workflows/translate_tx_pull_to_s3.yml | 2 +- .vscode_template/README.md | 3 +- CMakeLists.txt | 2 +- buildscripts/ci/linux/arm32/install_qt.sh | 77 -------- buildscripts/ci/linux/arm32/run_lupdate.sh | 27 --- buildscripts/ci/linux/setup.sh | 2 +- .../cmake/SetupBuildEnvironment.cmake | 4 +- buildscripts/cmake/SetupQt6.cmake | 4 +- 19 files changed, 37 insertions(+), 334 deletions(-) delete mode 100644 .github/workflows/build_linux_arm32.yml delete mode 100644 buildscripts/ci/linux/arm32/install_qt.sh delete mode 100644 buildscripts/ci/linux/arm32/run_lupdate.sh diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index a767e935288c4..9b64f9a2f1019 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -6,7 +6,6 @@ on: inputs: platforms: description: 'Platforms to build:' - # default: 'backend linux_arm32 linux_arm64 linux_x64 macos windows_x64 windows_portable' default: 'backend linux_arm64 linux_x64 macos windows_x64 windows_portable' required: true build_mode: @@ -29,7 +28,6 @@ on: inputs: platforms: description: 'Platforms to build:' - # default: 'backend linux_arm32 linux_arm64 linux_x64 macos windows_x64 windows_portable' default: 'backend linux_arm64 linux_x64 macos windows_x64 windows_portable' type: string required: true @@ -88,18 +86,6 @@ jobs: deploy: ${{ inputs.deploy_backend }} build_number: ${{ needs.generate_build_number.outputs.build_number }} - linux_arm32: - name: Linux ARM32 - needs: generate_build_number - if: ${{ contains(inputs.platforms, 'linux_arm32') }} - uses: ./.github/workflows/build_linux_arm32.yml - secrets: inherit - with: - build_mode: ${{ inputs.build_mode }} - publish: ${{ inputs.publish }} - sentry_project: ${{ inputs.sentry_project }} - build_number: ${{ needs.generate_build_number.outputs.build_number }} - linux: name: Linux needs: generate_build_number @@ -145,7 +131,7 @@ jobs: # Expose edge cases like different command versions, CRLF line endings, etc. # Use same OS versions as used in real build workflows. os: - - ubuntu-22.04 # linux_x64, backend, linux_arm32, linux_arm64 + - ubuntu-22.04 # linux_x64, linux_arm64, backend - macos-latest - windows-2025 # windows_x64, windows_portable runs-on: ${{ matrix.os }} diff --git a/.github/workflows/build_backend.yml b/.github/workflows/build_backend.yml index 66f0900da7ff2..39639eb9332aa 100644 --- a/.github/workflows/build_backend.yml +++ b/.github/workflows/build_backend.yml @@ -102,11 +102,11 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: 'linux' target: 'desktop' arch: 'linux_gcc_64' - modules: 'qt5compat qtnetworkauth qtshadertools qtwebsockets' + modules: 'qt5compat qtcanvaspainter qtnetworkauth qtshadertools qttasktree qtwebsockets' cache: true - name: Setup environment diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 4e0bf6b9ceaf8..90f2db37f089c 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -179,11 +179,11 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: ${{ matrix.qt-host }} target: 'desktop' arch: ${{ matrix.qt-arch }} - modules: 'qt5compat qtnetworkauth qtshadertools qtwebsockets' + modules: 'qt5compat qtcanvaspainter qtnetworkauth qtshadertools qttasktree qtwebsockets' cache: true - name: Setup environment run: | diff --git a/.github/workflows/build_linux_arm32.yml b/.github/workflows/build_linux_arm32.yml deleted file mode 100644 index a1129a362fda8..0000000000000 --- a/.github/workflows/build_linux_arm32.yml +++ /dev/null @@ -1,178 +0,0 @@ -name: 'Build: Linux arm32' - -on: - #pull_request: - workflow_dispatch: - inputs: - build_mode: - description: 'Build mode: devel, nightly, testing, stable' - default: 'devel' - required: true - publish: - description: 'Publish to FTP: on - publish' - default: 'off' - required: false - sentry_project: - description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox' - default: '' - required: false - workflow_call: - inputs: - build_mode: - description: 'Build mode: devel, nightly, testing, stable' - default: 'devel' - type: string - required: true - publish: - description: 'Publish to FTP: on - publish' - default: 'off' - type: string - required: false - sentry_project: - description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox' - default: '' - type: string - required: false - build_number: - description: "Build number (if not provided, will be generated)" - default: "" - type: string - required: false - -jobs: - linux_arm32: - runs-on: ubuntu-22.04-arm - steps: - - name: Clone repository - uses: actions/checkout@v6 - - name: Setup QEMU - run: | - sudo apt-get install qemu-user-static -y - - name: Configure workflow - env: - pull_request_title: ${{ github.event.pull_request.title }} - SENTRY_MUSE_MU4_KEY: ${{ secrets.SENTRY_MUSE_MU4_KEY }} - SENTRY_MUSE_MU4_SANDBOX_KEY: ${{ secrets.SENTRY_MUSE_MU4_SANDBOX_KEY }} - SENTRY_PROJECT: ${{ inputs.sentry_project }} - run: | - bash ./buildscripts/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ inputs.build_mode }} - BUILD_MODE=$(cat ./build.artifacts/env/build_mode.env) - - if [ -n "${{ inputs.build_number }}" ]; then - BUILD_NUMBER="${{ inputs.build_number }}" - bash ./buildscripts/ci/tools/make_build_number.sh "$BUILD_NUMBER" - else - bash ./buildscripts/ci/tools/make_build_number.sh - fi - BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env) - - DO_UPDATE_TS='false' - if [[ "$BUILD_MODE" == "testing" || "$BUILD_MODE" == "stable" ]]; then - DO_UPDATE_TS='true' - if [ -z "${{ secrets.TRANSIFEX_API_TOKEN }}" ]; then - echo "::warning::TRANSIFEX_API_TOKEN is empty; updating .ts files disabled" - DO_UPDATE_TS='false' - fi - fi - - DO_PLACEHOLDER_TRANSLATIONS='false' - if [[ "$BUILD_MODE" == "nightly" || "$BUILD_MODE" == "devel" ]]; then - DO_PLACEHOLDER_TRANSLATIONS='true' - fi - - DO_UPLOAD_SYMBOLS='false' - SENTRY_URL="" - - if [ "$SENTRY_MUSE_MU4_KEY" != "" ]; then - if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "stable" ]; then - SENTRY_PROJECT="mu4" - fi - - if [ "$SENTRY_PROJECT" == "mu4" ]; then - DO_UPLOAD_SYMBOLS='true' - SENTRY_URL=https://sentry.musescore.com/api/4/minidump/?sentry_key=$SENTRY_MUSE_MU4_KEY - fi - fi - - if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "nightly" ]; then - SENTRY_PROJECT="mu4-sandbox" - fi - - if [ "$SENTRY_PROJECT" == "mu4-sandbox" ] && [ "$SENTRY_MUSE_MU4_SANDBOX_KEY" != "" ]; then - DO_UPLOAD_SYMBOLS='true' - SENTRY_URL=https://sentry.musescore.com/api/3/minidump/?sentry_key=$SENTRY_MUSE_MU4_SANDBOX_KEY - fi - - DO_PUBLISH='false' - if [ ${{ inputs.publish }} == "on" ]; then - DO_PUBLISH='true' - if [ -z "${{ secrets.OSUOSL_SSH_ENCRYPT_SECRET }}" ]; then - echo "::warning::OSUOSL_SSH_ENCRYPT_SECRET is empty; not publishing to OSUOSL" - DO_PUBLISH='false' - fi - fi - - ADD_INFO="_${GITHUB_REF#refs/heads/}" - if [ "${{ github.event_name }}" == "pull_request" ]; then - ADD_INFO="_${{ github.event.pull_request.number }}_${pull_request_title}" - fi - UPLOAD_ARTIFACT_NAME="$(tr '":<>|*?/\\’' '_' <<<"MU4_${BUILD_NUMBER}_Lin_armv7l${ADD_INFO}")" - - echo "github.repository: ${{ github.repository }}" - echo "BUILD_MODE=$BUILD_MODE" | tee -a $GITHUB_ENV - echo "BUILD_NUMBER=$BUILD_NUMBER" | tee -a $GITHUB_ENV - echo "DO_UPDATE_TS=$DO_UPDATE_TS" | tee -a $GITHUB_ENV - echo "DO_PLACEHOLDER_TRANSLATIONS=$DO_PLACEHOLDER_TRANSLATIONS" | tee -a $GITHUB_ENV - echo "DO_UPLOAD_SYMBOLS=$DO_UPLOAD_SYMBOLS" | tee -a $GITHUB_ENV - echo "SENTRY_PROJECT=$SENTRY_PROJECT" | tee -a $GITHUB_ENV - echo "SENTRY_URL=$SENTRY_URL" | tee -a $GITHUB_ENV - echo "DO_PUBLISH=$DO_PUBLISH" | tee -a $GITHUB_ENV - echo "UPLOAD_ARTIFACT_NAME=$UPLOAD_ARTIFACT_NAME" | tee -a $GITHUB_ENV - - - name: Update .ts files (tx pull) - if: env.DO_UPDATE_TS == 'true' - uses: transifex/cli-action@v2 - with: - token: ${{ secrets.TRANSIFEX_API_TOKEN }} - args: "pull -f" - - - name: Register gcc problem matcher - run: echo "::add-matcher::.github/problem_matchers/gcc.json" - - - name: Setup, Generate _en.ts files, Build AppImage, Package, Checksum - env: # For lupdate - LUPDATE_ARGS: "" - POSTPROCESS_ARGS: ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }} - run: | - C_URL=${SENTRY_URL}; if [ -z "$C_URL" ]; then C_URL="''"; fi - sudo docker run --platform linux/arm -i -v "${PWD}:/MuseScore" -v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static "arm32v7/ubuntu:jammy" /bin/bash -c "\ - cd /MuseScore && \ - bash /MuseScore/buildscripts/ci/linux/setup.sh --arch armv7l && \ - bash /MuseScore/buildscripts/ci/linux/arm32/install_qt.sh && \ - git config --global --add safe.directory /MuseScore && \ - bash /MuseScore/buildscripts/ci/linux/arm32/run_lupdate.sh && \ - bash /MuseScore/buildscripts/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --crash_log_url $C_URL --arch armv7l && \ - bash /MuseScore/buildscripts/ci/linux/package.sh --arch armv7l && \ - bash /MuseScore/buildscripts/ci/tools/checksum.sh \ - " - - name: Generate and upload dump symbols - if: env.DO_UPLOAD_SYMBOLS == 'true' - run: | - APP_BIN=$(find "$(pwd)/build.release/src/app/" -type f -name "mscore4portable*" -print -quit) - ARCH=armv7l - sudo cmake -DAPP_BIN=${APP_BIN} \ - -DARCH=${ARCH} \ - -DSENTRY_URL=https://sentry.musescore.com \ - -DSENTRY_ORG=sentry \ - -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_MUSE_AUTH_TOKEN }} \ - -DSENTRY_PROJECT=${SENTRY_PROJECT} \ - -P buildscripts/ci/crashdumps/ci_generate_and_upload.cmake - - name: Publish to OSUOSL - if: env.DO_PUBLISH == 'true' - run: | - bash ./buildscripts/ci/tools/osuosl/publish.sh -s ${{ secrets.OSUOSL_SSH_ENCRYPT_SECRET }} --os linux --arch armv7l -v 4 - - name: Upload artifacts on GitHub - uses: actions/upload-artifact@v7 - with: - name: ${{ env.UPLOAD_ARTIFACT_NAME }} - path: ./build.artifacts/ diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 944957e5923b6..82c78e36c8d5a 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -160,16 +160,16 @@ jobs: bash ./buildscripts/ci/tools/setup_ccache_config.sh - name: Install Qt - # uses: jurplel/install-qt-action@v4 - # with: - # version: 6.10.2 - # host: 'mac' - # target: 'desktop' - # arch: 'clang_64' - # modules: 'qt5compat qtnetworkauth qtshadertools qtwebsockets' - # cache: true - run: | - bash ./buildscripts/ci/macos/install_qt.sh + uses: jurplel/install-qt-action@v4 + with: + version: 6.11.0 + host: 'mac' + target: 'desktop' + arch: 'clang_64' + modules: 'qt5compat qtcanvaspainter qtnetworkauth qtshadertools qttasktree qtwebsockets' + cache: true + # run: | + # bash ./buildscripts/ci/macos/install_qt.sh - name: Download dependencies run: | diff --git a/.github/workflows/build_wasm.yml b/.github/workflows/build_wasm.yml index 3f168d7531a36..438a00cdb8469 100644 --- a/.github/workflows/build_wasm.yml +++ b/.github/workflows/build_wasm.yml @@ -62,11 +62,11 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: all_os target: 'wasm' arch: wasm_singlethread - modules: 'qt5compat qtshadertools' + modules: 'qt5compat qtcanvaspainter qtshadertools qttasktree qtwebsockets' cache: true - name: Setup environment diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 93b6179308ff8..0f76a674801d5 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -155,11 +155,11 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: 'windows' target: 'desktop' arch: 'win64_msvc2022_64' - modules: 'qt5compat qtnetworkauth qtshadertools qtwebsockets' + modules: 'qt5compat qtcanvaspainter qtnetworkauth qtshadertools qttasktree qtwebsockets' cache: true - name: Setup environment run: | @@ -319,11 +319,11 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: 'windows' target: 'desktop' arch: 'win64_msvc2022_64' - modules: 'qt5compat qtnetworkauth qtshadertools qtwebsockets' + modules: 'qt5compat qtcanvaspainter qtnetworkauth qtshadertools qttasktree qtwebsockets' cache: true - name: Setup environment run: | diff --git a/.github/workflows/check_unit_tests.yml b/.github/workflows/check_unit_tests.yml index c3485e84da809..9cda545404c4e 100644 --- a/.github/workflows/check_unit_tests.yml +++ b/.github/workflows/check_unit_tests.yml @@ -50,11 +50,11 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: 'linux' target: 'desktop' arch: 'linux_gcc_64' - modules: 'qt5compat qtnetworkauth qtshadertools qtwebsockets' + modules: 'qt5compat qtcanvaspainter qtnetworkauth qtshadertools qttasktree qtwebsockets' cache: true - name: Setup environment run: | diff --git a/.github/workflows/check_visual_tests.yml b/.github/workflows/check_visual_tests.yml index c1636307753ef..99792e1cb7d58 100644 --- a/.github/workflows/check_visual_tests.yml +++ b/.github/workflows/check_visual_tests.yml @@ -84,11 +84,11 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: 'linux' target: 'desktop' arch: 'linux_gcc_64' - modules: 'qt5compat qtnetworkauth qtshadertools qtwebsockets' + modules: 'qt5compat qtcanvaspainter qtnetworkauth qtshadertools qttasktree qtwebsockets' cache: true - name: Setup environment run: | @@ -149,11 +149,11 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: 'linux' target: 'desktop' arch: 'linux_gcc_64' - modules: 'qt5compat qtnetworkauth qtshadertools qtwebsockets' + modules: 'qt5compat qtcanvaspainter qtnetworkauth qtshadertools qttasktree qtwebsockets' cache: true - name: Setup environment run: | diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a646bb8717678..f09cd3a886fae 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -5,7 +5,7 @@ on: inputs: platforms: description: 'Platforms to build:' - default: 'backend linux_arm32 linux_arm64 linux_x64 macos windows_x64 windows_portable' + default: 'backend linux_arm64 linux_x64 macos windows_x64 windows_portable' required: true release_type: description: 'Release type: alpha,beta,rc,stable, or any label with chars A-Za-z0-9._ for testing' diff --git a/.github/workflows/translate_lupdate.yml b/.github/workflows/translate_lupdate.yml index 40d165a6359fc..378c42dd467eb 100644 --- a/.github/workflows/translate_lupdate.yml +++ b/.github/workflows/translate_lupdate.yml @@ -32,7 +32,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: "linux" target: "desktop" arch: "linux_gcc_64" diff --git a/.github/workflows/translate_tx_pull_to_s3.yml b/.github/workflows/translate_tx_pull_to_s3.yml index 4e41912e699f9..83df568618612 100644 --- a/.github/workflows/translate_tx_pull_to_s3.yml +++ b/.github/workflows/translate_tx_pull_to_s3.yml @@ -73,7 +73,7 @@ jobs: if: steps.configure.outputs.DO_PUSH_TO_S3 == 'true' uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.0 host: "linux" target: "desktop" arch: "linux_gcc_64" diff --git a/.vscode_template/README.md b/.vscode_template/README.md index 532ee8aa7c041..a257c6202d5d7 100644 --- a/.vscode_template/README.md +++ b/.vscode_template/README.md @@ -28,7 +28,7 @@ sudo apt install lldb Edit `$HOME/.bashrc`, specify the current Qt, for example ``` -export QT_DIR=$HOME/Qt/6.10.1/gcc_64 +export QT_DIR=$HOME/Qt/6.11.0/gcc_64 export PATH=$HOME/Qt/Tools/CMake/bin:$PATH export PATH=$HOME/Qt/Tools/Ninja:$PATH @@ -59,4 +59,3 @@ Don't use the `flatpak` version because it has limited permissions; for example, * There will be a choice of cmake preset, select `Qt Clang Debug`. * There will be buttons on the bottom panel: Build, Debug, Run * Enjoy! - diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e127b89f710d..70cde6b21d2f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ if (APPLE) cmake_minimum_required(VERSION 3.26...3.31) # Min. required for Swift-C++ interop else() - cmake_minimum_required(VERSION 3.22...3.31) # Min. required by Qt 6.10 + cmake_minimum_required(VERSION 3.22...3.31) # Min. required by Qt 6.11 endif() project(MuseScore LANGUAGES C CXX) diff --git a/buildscripts/ci/linux/arm32/install_qt.sh b/buildscripts/ci/linux/arm32/install_qt.sh deleted file mode 100644 index 9e1392f65a144..0000000000000 --- a/buildscripts/ci/linux/arm32/install_qt.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-3.0-only -# MuseScore-Studio-CLA-applies -# -# MuseScore Studio -# Music Composition & Notation -# -# Copyright (C) 2025 MuseScore Limited -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -echo "Install Qt" -trap 'echo Qt installation failed; exit 1' ERR - -BUILD_TOOLS=$HOME/build_tools -ENV_FILE=$BUILD_TOOLS/environment.sh - -# TODO: Update to Qt 6.10 -apt_packages_qt6=( - libqt6core5compat6-dev - libqt6networkauth6-dev - libqt6opengl6-dev - libqt6printsupport6 - libqt6qml6 - libqt6quick6 - libqt6quickcontrols2-6 - libqt6quicktemplates2-6 - libqt6quickwidgets6 - libqt6shadertools6-dev - libqt6svg6-dev - libqt6websockets6-dev - libqt6xml6 - qml6-module-* # installs all qml modules - qt6-base-dev - qt6-base-private-dev - qt6-declarative-dev - qt6-gtk-platformtheme - qt6-l10n-tools - qt6-scxml-dev - qt6-tools-dev - qt6-tools-dev-tools - qt6-wayland -) - -apt-get install -y --no-install-recommends \ - "${apt_packages_qt6[@]}" - -qt_dir="/usr/lib/arm-linux-gnueabihf/qt6" - -if [[ ! -d "${qt_dir}" ]]; then - echo "Qt directory not found: ${qt_dir}" - exit 1 -fi - -export QT_SELECT=qt6 -echo export QT_SELECT=qt6 >>${ENV_FILE} -echo export QT_ROOT_DIR="${qt_dir}" >>${ENV_FILE} -echo export QT_PLUGIN_PATH="${qt_dir}/plugins" >>${ENV_FILE} -echo export QML2_IMPORT_PATH="${qt_dir}/qml" >>${ENV_FILE} -# explicitly set QMAKE path for linuxdeploy-plugin-qt -echo export QMAKE="/usr/bin/qmake6" >>${ENV_FILE} - -echo export CFLAGS="-Wno-psabi" >>${ENV_FILE} -echo export CXXFLAGS="-Wno-psabi" >>${ENV_FILE} - -# https://askubuntu.com/questions/1460242/ubuntu-22-04-with-qt6-qmake-could-not-find-a-qt-installation-of -qtchooser -install qt6 $(which qmake6) diff --git a/buildscripts/ci/linux/arm32/run_lupdate.sh b/buildscripts/ci/linux/arm32/run_lupdate.sh deleted file mode 100644 index c16e02ccac530..0000000000000 --- a/buildscripts/ci/linux/arm32/run_lupdate.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: GPL-3.0-only -# MuseScore-Studio-CLA-applies -# -# MuseScore Studio -# Music Composition & Notation -# -# Copyright (C) 2021 MuseScore Limited -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -BUILD_TOOLS=$HOME/build_tools -ENV_FILE=$BUILD_TOOLS/environment.sh - -source $ENV_FILE - -bash ./tools/translations/run_lupdate.sh $@ diff --git a/buildscripts/ci/linux/setup.sh b/buildscripts/ci/linux/setup.sh index 54cac8200104e..d6bedaa47ca9d 100644 --- a/buildscripts/ci/linux/setup.sh +++ b/buildscripts/ci/linux/setup.sh @@ -28,7 +28,7 @@ BUILD_TOOLS=$HOME/build_tools ENV_FILE=$BUILD_TOOLS/environment.sh PACKARCH="x86_64" # x86_64, armv7l, aarch64, wasm COMPILER="gcc" # gcc, clang -EMSDK_VERSION="4.0.7" # for Qt 6.10 +EMSDK_VERSION="4.0.7" # for Qt 6.11 BUILD_PIPEWIRE=false while [[ "$#" -gt 0 ]]; do diff --git a/buildscripts/cmake/SetupBuildEnvironment.cmake b/buildscripts/cmake/SetupBuildEnvironment.cmake index 43118c0813c78..ca447c4d08531 100644 --- a/buildscripts/cmake/SetupBuildEnvironment.cmake +++ b/buildscripts/cmake/SetupBuildEnvironment.cmake @@ -63,8 +63,8 @@ endif() # Mac-specific if(OS_IS_MAC) - set(MACOSX_DEPLOYMENT_TARGET 10.15.4) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15.4) + set(MACOSX_DEPLOYMENT_TARGET 13.0) + set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0) endif(OS_IS_MAC) # MSVC-specific diff --git a/buildscripts/cmake/SetupQt6.cmake b/buildscripts/cmake/SetupQt6.cmake index a0d56a57fb47b..856e98caa69b5 100644 --- a/buildscripts/cmake/SetupQt6.cmake +++ b/buildscripts/cmake/SetupQt6.cmake @@ -85,13 +85,13 @@ if (OS_IS_WASM) set(QT_WASM_EXTRA_EXPORTED_METHODS ccall) endif() -find_package(Qt6 6.8 REQUIRED COMPONENTS ${qt_components}) +find_package(Qt6 6.9 REQUIRED COMPONENTS ${qt_components}) include(QtInstallPaths) message(STATUS "Qt version: ${Qt6_VERSION}") -qt_standard_project_setup(REQUIRES 6.8 SUPPORTS_UP_TO 6.10) +qt_standard_project_setup(REQUIRES 6.9 SUPPORTS_UP_TO 6.11) if (QT_IS_STATIC) qt_add_library(all_qml_plugins STATIC)