Switch to Qt 6.8

.github/workflows/build_backend.yml

@@ -48,9 +48,9 @@ jobs:
         BUILD_NUMBER=$(cat ./build.artifacts/env/build_number.env)
 
         DO_PUBLISH='false'
-        if [ "${{ inputs.publish }}" = "on" ]; then 
+        if [ "${{ inputs.publish }}" = "on" ]; then
           DO_PUBLISH='true';
-          if [ -z "${{ secrets.S3_KEY_CONVERTER }}" ]; then 
+          if [ -z "${{ secrets.S3_KEY_CONVERTER }}" ]; then
             echo "::warning::S3_KEY_CONVERTER is empty; publishing to S3 disabled"
             DO_PUBLISH='false'
           fi
@@ -74,6 +74,16 @@ jobs:
         echo "VERSION_MAJOR_MINOR=$VERSION_MAJOR_MINOR" | tee -a $GITHUB_ENV
         echo "GITHUB_ARTIFACT_NAME=$GITHUB_ARTIFACT_NAME" | tee -a $GITHUB_ENV
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        host: 'linux'
+        target: 'desktop'
+        arch: 'linux_gcc_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
+
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/backend/setup.sh

.github/workflows/build_linux.yml

@@ -133,15 +133,25 @@ jobs:
         sudo apt-get update && sudo apt-get install -y ccache
         bash ./buildscripts/ci/tools/setup_ccache_config.sh
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        host: 'linux'
+        target: 'desktop'
+        arch: 'linux_gcc_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/linux/setup.sh
+
     - name: Generate _en.ts files
       env:
         LUPDATE_ARGS: ""
         POSTPROCESS_ARGS: ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }}
       run: |
-        bash ./buildscripts/ci/translation/run_lupdate.sh
+        bash ./tools/translations/run_lupdate.sh
     - name: Update .ts files
       if: env.DO_UPDATE_TS == 'true'
       run: |

.github/workflows/build_linux_arm.yml

@@ -140,7 +140,7 @@ jobs:
     #     LUPDATE_ARGS: ""
     #     POSTPROCESS_ARGS: ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }}
     #   run: |
-    #     bash ./buildscripts/ci/translation/run_lupdate.sh
+    #     bash ./tools/translations/run_lupdate.sh
     - name: Update .ts files
       if: env.DO_UPDATE_TS == 'true'
       run: |
@@ -160,7 +160,7 @@ jobs:
           cd /MuseScore && \
           export QT_SELECT=qt6 && \
           bash /MuseScore/buildscripts/ci/linux/setup-arm.sh --arch armv7l && \
-          bash /MuseScore/buildscripts/ci/translation/run_lupdate.sh && \
+          bash /MuseScore/tools/translations/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 \
@@ -269,7 +269,7 @@ jobs:
     #     LUPDATE_ARGS: ""
     #     POSTPROCESS_ARGS: ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }}
     #   run: |
-    #     bash ./buildscripts/ci/translation/run_lupdate.sh
+    #     bash ./tools/translations/run_lupdate.sh
     - name: Update .ts files
       if: env.DO_UPDATE_TS == 'true'
       run: |
@@ -289,7 +289,7 @@ jobs:
           cd /MuseScore && \
           export QT_SELECT=qt6 && \
           bash /MuseScore/buildscripts/ci/linux/setup-arm.sh --arch aarch64 && \
-          bash /MuseScore/buildscripts/ci/translation/run_lupdate.sh && \
+          bash /MuseScore/tools/translations/run_lupdate.sh && \
           bash /MuseScore/buildscripts/ci/linux/build.sh -n ${{ env.BUILD_NUMBER }} --crash_log_url $C_URL --arch aarch64 && \
           bash /MuseScore/buildscripts/ci/linux/package.sh --arch aarch64 && \
           bash /MuseScore/buildscripts/ci/tools/checksum.sh \

.github/workflows/build_macos.yml

@@ -151,15 +151,25 @@ jobs:
         brew install ccache
         bash ./buildscripts/ci/tools/setup_ccache_config.sh
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        host: 'mac'
+        target: 'desktop'
+        arch: 'clang_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/macos/setup.sh
+
     - name: Generate _en.ts files
       env:
         LUPDATE_ARGS: ""
         POSTPROCESS_ARGS: "--warn-only ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }}"
       run: |
-        bash ./buildscripts/ci/translation/run_lupdate.sh
+        bash ./tools/translations/run_lupdate.sh
     - name: Update .ts files
       if: env.DO_UPDATE_TS == 'true'
       run: |

.github/workflows/build_windows.yml

@@ -132,21 +132,27 @@ jobs:
         echo "DO_PUBLISH=$DO_PUBLISH" | tee -a $GITHUB_ENV
         echo "UPLOAD_ARTIFACT_NAME=$UPLOAD_ARTIFACT_NAME" | tee -a $GITHUB_ENV
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2022_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
     - name: Setup environment
       run: |
         buildscripts\ci\windows\setup.bat
-    - name: Make environment file
-      shell: bash
-      run: |
-        bash ./buildscripts/ci/windows/make_environment.sh
+
     - name: Generate _en.ts files
       shell: bash
       env:
         LUPDATE_ARGS: ""
         POSTPROCESS_ARGS: "--warn-only ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }}"
         POSTPROCESS_LAUNCHER: "python3 -X utf8"
       run: |
-        bash ./buildscripts/ci/translation/run_lupdate.sh
+        bash ./tools/translations/run_lupdate.sh
     - name: Update .ts files
       if: env.DO_UPDATE_TS == 'true'
       shell: bash
@@ -253,21 +259,27 @@ jobs:
         echo "DO_PUBLISH=$DO_PUBLISH" | tee -a $GITHUB_ENV
         echo "UPLOAD_ARTIFACT_NAME=$UPLOAD_ARTIFACT_NAME" | tee -a $GITHUB_ENV
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2022_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
     - name: Setup environment
       run: |
         buildscripts\ci\windows\setup.bat --portable ON
-    - name: Make environment file
-      shell: bash
-      run: |
-        bash ./buildscripts/ci/windows/make_environment.sh
+
     - name: Generate _en.ts files
       shell: bash
       env:
         LUPDATE_ARGS: ""
         POSTPROCESS_ARGS: "--warn-only ${{ env.DO_PLACEHOLDER_TRANSLATIONS == 'true' && '--generate-placeholder-translations' || '' }}"
         POSTPROCESS_LAUNCHER: "python3 -X utf8"
       run: |
-        bash ./buildscripts/ci/translation/run_lupdate.sh
+        bash ./tools/translations/run_lupdate.sh
     - name: Update .ts files
       if: env.DO_UPDATE_TS == 'true'
       shell: bash

.github/workflows/check_unit_tests.yml

@@ -34,9 +34,19 @@ jobs:
         sudo apt-get update && sudo apt-get install -y ccache
         bash ./buildscripts/ci/tools/setup_ccache_config.sh
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        host: 'linux'
+        target: 'desktop'
+        arch: 'linux_gcc_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/linux/setup.sh
+
     - name: Build
       run: |
         mkdir -p build.artifacts/env

.github/workflows/check_visual_tests.yml

@@ -41,9 +41,9 @@ jobs:
       if: github.event_name == 'push'
       run: |
         REFERENCE_SHA=${{ github.event.before }}
-        if [[ -z "$REFERENCE_SHA" || "$REFERENCE_SHA" == 0000000000000000000000000000000000000000 ]]; then 
-          DO_RUN='false' 
-        else 
+        if [[ -z "$REFERENCE_SHA" || "$REFERENCE_SHA" == 0000000000000000000000000000000000000000 ]]; then
+          DO_RUN='false'
+        else
           DO_RUN='true'
         fi
         echo "REFERENCE_SHA=$REFERENCE_SHA" >> $GITHUB_ENV
@@ -79,9 +79,19 @@ jobs:
         sudo apt-get update && sudo apt-get install -y ccache
         bash ./buildscripts/ci/tools/setup_ccache_config.sh
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        host: 'linux'
+        target: 'desktop'
+        arch: 'linux_gcc_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/linux/setup.sh
+
     - name: Build and Pack
       run: |
         bash ./buildscripts/ci/vtests/build_and_pack.sh
@@ -117,9 +127,19 @@ jobs:
         sudo apt-get update && sudo apt-get install -y ccache
         bash ./buildscripts/ci/tools/setup_ccache_config.sh
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        host: 'linux'
+        target: 'desktop'
+        arch: 'linux_gcc_64'
+        modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
     - name: Setup environment
       run: |
         bash ./buildscripts/ci/linux/setup.sh
+
     - name: Build and Pack
       run: |
         bash ./buildscripts/ci/vtests/build_and_pack.sh

.github/workflows/translate_lupdate.yml

@@ -28,13 +28,19 @@ jobs:
 
           echo "LUPDATE_ARGS=$LUPDATE_ARGS" | tee -a $GITHUB_ENV
 
-      - name: Setup environment
-        run: |
-          bash ./buildscripts/ci/translation/qt_install.sh
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          aqtversion: '==3.1.*'
+          version: '6.8.0'
+          host: 'linux'
+          target: 'desktop'
+          arch: 'linux_gcc_64'
+          archives: 'qttools'
 
       - name: Run lupdate
         run: |
-          bash ./buildscripts/ci/translation/run_lupdate.sh
+          bash ./tools/translations/run_lupdate.sh
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7

.github/workflows/translate_tx_pull_to_s3.yml

@@ -72,11 +72,20 @@ jobs:
         run: |
           bash ./buildscripts/ci/translation/tx_install.sh -t ${{ secrets.TRANSIFEX_API_TOKEN }} -s linux
 
+      - name: Install Qt for lrelease
+        if: env.DO_PUSH_TO_S3 == 'true'
+        uses: jurplel/install-qt-action@v4
+        with:
+          aqtversion: '==3.1.*'
+          version: '6.8.0'
+          host: 'linux'
+          target: 'desktop'
+          arch: 'linux_gcc_64'
+          archives: 'qttools'
+
       - name: Setup environment for pushing to S3
         if: env.DO_PUSH_TO_S3 == 'true'
         run: |
-          # lrelease
-          bash ./buildscripts/ci/translation/qt_install.sh
           bash ./buildscripts/ci/tools/s3_install.sh --s3_key ${{ secrets.S3_KEY }} --s3_secret ${{ secrets.S3_SECRET }}
 
           bash ./buildscripts/ci/tools/make_build_number.sh

CMakeLists.txt

@@ -16,9 +16,9 @@
 # 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 <https://www.gnu.org/licenses/>. 
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.21.1) # Min. required by Qt 6.8
 
 project(MuseScore LANGUAGES C CXX)
 
@@ -151,7 +151,6 @@ if (MUE_COMPILE_MACOS_PRECOMPILED_DEPS_PATH)
     set(MUE_COMPILE_USE_SYSTEM_OPUS ON)
 endif()
 
-set(QT_MIN_VERSION "6.2.4")
 set(QT_ADD_STATEMACHINE ON)
 if (MUSE_MODULE_NETWORK_WEBSOCKET)
     set(QT_ADD_WEBSOCKET ON)

buildscripts/ci/linux/local/workflow.sh

@@ -37,7 +37,7 @@ fi
 
 #    - name: Generate _en.ts files
 #      run: |
-        bash ./buildscripts/ci/translation/run_lupdate.sh
+        bash ./tools/translations/run_lupdate.sh
 
 #    - name: Update .ts files
 #      if: env.DO_UPDATE_TS == 'true'