Fix #16848 slip mode rendering in split stem view

.codespellignore

@@ -12,3 +12,4 @@ bufferIn
 indexIn
 allLocations
 allRight
+leadIn

.github/ISSUE_TEMPLATE/bug.yaml

@@ -1,7 +1,7 @@
 name: 🐛 Bug Report
 description: |
   Describe your problem here.
-labels: [bug]
+type: "bug"
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,7 +1,7 @@
 name: 🚀 Feature Request
 description: |
   What feature would you like to see added to Mixxx?
-labels: [feature]
+type: "feature"
 body:
   - type: markdown
     attributes:

.github/dependabot.yml

@@ -4,9 +4,9 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    target-branch: "2.6"
+    target-branch: "2.5"
   - package-ecosystem: "pre-commit"
     directory: "/"
     schedule:
       interval: "weekly"
-    target-branch: "2.6"
+    target-branch: "2.5"

.github/workflows/benchmark.yml

@@ -126,18 +126,17 @@ jobs:
         with:
           # This should always match the minimum required version in
           # our CMakeLists.txt
-          cmake-version: "3.21.x"
+          cmake-version: "3.22.x"
 
       - name: "[Windows] Set up cmake"
         uses: jwlawson/actions-setup-cmake@v2.2
         # Ubuntu 24.04 should use the CMake version from the repos.
         # On Windows ARM64 this action installs the x64 version which has unwanted side effects
         if: runner.os == 'Windows' && runner.arch != 'ARM64'
         with:
-          # This is a workaround for a SSL false positive in cmake 3.26.4
-          # When downloading the manual. 3.21 is required for installing the
-          # ANGLE Dlls via IMPORTED_RUNTIME_ARTIFACTS
-          cmake-version: "3.21.x"
+          # This is a workaround for a SSL false positive in cmake 3.26.4 when downloading the manual.
+          # 3.22 is required for Qt 6.10 https://doc.qt.io/qt-6.10/cmake-supported-cmake-versions.html
+          cmake-version: "3.22.x"
 
       - name: "[Windows] Set up MSVC Developer Command Prompt"
         if: runner.os == 'Windows'

.github/workflows/build.yml

@@ -31,6 +31,10 @@ on:
         required: false
       MACOS_NOTARIZATION_APP_SPECIFIC_PASSWORD:
         required: false
+      ANDROID_SIGNING_KEYSTORE_BASE64:
+        required: false
+      ANDROID_SIGNING_PASSWORD:
+        required: false
       NETLIFY_BUILD_HOOK:
         required: false
       RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY:
@@ -113,8 +117,8 @@ jobs:
             artifacts_name: macOS ARM DMG
             artifacts_path: build/*.dmg
             artifacts_slug: macos-macosarm
-          - name: Windows 2022 x64
-            os: windows-2022
+          - name: Windows Server 2025 VS2026 x64
+            os: windows-2025-vs2026
             # Attention: If you change the cmake_args for the Windows CI build,
             #            also adjust the for the local Windows build setup in
             #            ./tools/windows_buildenv.bat
@@ -140,8 +144,8 @@ jobs:
             artifacts_path: build/*.msi
             artifacts_slug: windows-win64
             arch: x64
-          - name: Windows 11 ARM64
-            os: windows-11-arm
+          - name: Windows 11 VS2026 ARM64
+            os: windows-11-vs2026-arm
             # Attention: If you change the cmake_args for the Windows CI build,
             #            also adjust the for the local Windows build setup in
             #            ./tools/windows_buildenv.bat
@@ -168,11 +172,36 @@ jobs:
             artifacts_path: build/*.msi
             artifacts_slug: windows-winarm
             arch: arm64
+          - name: Android 15 arm64
+            os: ubuntu-24.04
+            # DBUILD_TESTING=OFF: error: OpenMP support and version of OpenMP (31, 40 or 45) differs
+            cmake_args: >-
+              -DBULK=ON
+              -DQT6=ON
+              -DQML=ON
+              -DHID=ON
+              -DVCPKG_TARGET_TRIPLET=arm64-android
+              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-linux-release
+              -DCMAKE_SYSTEM_NAME=Android
+              -DBUILD_TESTING=OFF
+              -DBUILD_BENCH=OFF
+            buildenv_basepath: /home/runner/buildenv
+            buildenv_script: tools/android_buildenv.sh
+            artifacts_name: Android 15 APK
+            artifacts_path: build/android-build/build/outputs/apk/release/*.apk
+            artifacts_slug: android-15
+            compiler_cache: ccache
+            compiler_cache_path: /home/runner/.cache/ccache
+            crosscompile: true
+            arch: arm64
 
     env:
       # macOS codesigning
       MACOS_CODESIGN_CERTIFICATE_P12_BASE64: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }}
       MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }}
+      # Android signing
+      ANDROID_SIGNING_KEYSTORE_BASE64: ${{ secrets.ANDROID_SIGNING_KEYSTORE_BASE64 }}
+      ANDROID_SIGNING_PASSWORD: ${{ secrets.ANDROID_SIGNING_PASSWORD }}
 
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.name }}
@@ -207,7 +236,7 @@ jobs:
         with:
           # This should always match the minimum required version in
           # our CMakeLists.txt
-          cmake-version: "3.21.x"
+          cmake-version: "3.22.x"
 
       - name: "[Windows] Set up cmake"
         uses: jwlawson/actions-setup-cmake@v2.2
@@ -265,6 +294,33 @@ jobs:
           echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}"
           echo "APPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> $GITHUB_ENV
 
+      - name: "[android] Setup signing key"
+        if: startsWith(matrix.artifacts_slug, 'android')
+        run: |
+          if [ -z "${ANDROID_SIGNING_KEYSTORE_BASE64}" ]; then
+            # If no signing key is available (e.g running on a fork), generate a temporary key
+            keytool \
+              -genkey \
+              -keystore mixxx.keystore \
+              -alias mixxx \
+              -keyalg RSA \
+              -keysize 2048 \
+              -validity 365 \
+              -keypass mixxxandroid \
+              -storepass mixxxandroid \
+              -dname "CN=${{ github.actor }}"
+            echo "QT_ANDROID_KEYSTORE_ALIAS=mixxx" >> $GITHUB_ENV
+            echo "QT_ANDROID_KEYSTORE_KEY_PASS=mixxxandroid" >> $GITHUB_ENV
+            echo "QT_ANDROID_KEYSTORE_STORE_PASS=mixxxandroid" >> $GITHUB_ENV
+            echo "QT_ANDROID_KEYSTORE_PATH=${{ github.workspace }}/mixxx.keystore" >> $GITHUB_ENV
+          else
+            echo "${{ env.ANDROID_SIGNING_KEYSTORE_BASE64 }}" | base64 -d > ${{ github.workspace }}/mixxx.keystore
+            echo "QT_ANDROID_KEYSTORE_ALIAS=mixxx" >> $GITHUB_ENV
+            echo "QT_ANDROID_KEYSTORE_KEY_PASS=${{ env.ANDROID_SIGNING_PASSWORD }}" >> $GITHUB_ENV
+            echo "QT_ANDROID_KEYSTORE_STORE_PASS=${{ env.ANDROID_SIGNING_PASSWORD }}" >> $GITHUB_ENV
+            echo "QT_ANDROID_KEYSTORE_PATH=${{ github.workspace }}/mixxx.keystore" >> $GITHUB_ENV
+          fi
+
       - name: "[macOS/Linux] Set up build environment"
         if: matrix.buildenv_script != null && runner.os != 'Windows'
         run: ${{ matrix.buildenv_script }} setup
@@ -298,6 +354,29 @@ jobs:
           ${{ matrix.compiler_cache }} --max-size=2G
         if: runner.os != 'windows'
 
+      # Remove unused pre-installed software as the runner runs out of space otherwise
+      # Currently freeing up about 17.7G, ~20%
+      - name: "[android] Free up disk space"
+        if: startsWith(matrix.artifacts_slug, 'android')
+        run: |
+          sudo apt-get autoremove -y && sudo apt-get clean
+          sudo rm -rf /home/packer                 # Free up 677M
+          sudo rm -rf /opt/az                      # Free up 649M
+          sudo rm -rf /opt/google                  # Free up 378M
+          sudo rm -rf /opt/hostedtoolcache/CodeQL  # Free up 1.6G
+          sudo rm -rf /opt/hostedtoolcache/go      # Free up 808M
+          sudo rm -rf /opt/hostedtoolcache/node    # Free up 532M
+          sudo rm -rf /opt/hostedtoolcache/PyPy    # Free up 520M
+          sudo rm -rf /opt/hostedtoolcache/Python  # Free up 1.5G
+          sudo rm -rf /opt/microsoft               # Free up 781M
+          sudo rm -rf /opt/pipx                    # Free up 499M
+          sudo rm -rf /usr/lib/google-cloud-sdk    # Free up 957M
+          sudo rm -rf /usr/local/julia1.11.7       # Free up 996M
+          sudo rm -rf /usr/local/share/powershell  # Free up 1.3G
+          sudo rm -rf /usr/share/dotnet            # Free up 3.4G
+          sudo rm -rf /usr/share/swift             # Free up 3.2G
+          sudo rm -rf /usr/local/share/vcpkg       # Size unknown, but obvious duplicate
+
       - name: "Create build directory"
         run: mkdir build
 
@@ -425,7 +504,7 @@ jobs:
           path: ${{ github.workspace }}/build/_CPack_Packages/win64/WIX/wix.log
 
       - name: "[Ubuntu] Import PPA GPG key"
-        if: startsWith(matrix.os, 'ubuntu') && env.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY != null
+        if: startsWith(matrix.os, 'ubuntu') && matrix.crosscompile != true && env.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY != null
         run: gpg --import <(echo "${{ secrets.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY }}")
         env:
           RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY: ${{ secrets.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY }}
@@ -497,6 +576,15 @@ jobs:
           --dest-url 'https://downloads.mixxx.org'
           ${{ matrix.artifacts_path }}
 
+      # TODO create a F-droid repo?
+      # - name: fdroid nightly
+      #   run: |
+      #     sudo add-apt-repository ppa:fdroid/fdroidserver
+      #     sudo apt-get update
+      #     sudo apt-get install apksigner fdroidserver --no-install-recommends
+      #     export DEBUG_KEYSTORE=$
+      #     fdroid nightly --archive-older 10
+
       # Warning: do not move this step before restoring caches or it will break caching due to
       # https://github.com/actions/cache/issues/531
       - name: "[Windows] Install rsync and openssh"
@@ -550,9 +638,9 @@ jobs:
           ssh-keyscan "${SSH_HOST}" >> "${HOME}/.ssh/known_hosts"
           echo "SSH_AUTH_SOCK=${SSH_AUTH_SOCK}" >> "${GITHUB_ENV}"
 
-      - name: "[macOS/Windows] Upload build to downloads.mixxx.org"
+      - name: "[Android/macOS/Windows] Upload build to downloads.mixxx.org"
         # skip deploying Ubuntu builds to downloads.mixxx.org because these are deployed to the PPA
-        if: runner.os != 'Linux' && inputs.publish && env.SSH_AUTH_SOCK != null
+        if: startsWith(matrix.artifacts_slug, 'ubuntu') != true && inputs.publish && env.SSH_AUTH_SOCK != null
         shell: bash --login -eo pipefail "{0}"
         run: rsync --verbose --recursive --checksum --times --delay-updates "deploy/" "${SSH_USER}@${SSH_HOST}:${DESTDIR}/"
         env:

.github/workflows/download_cleanup.yml

@@ -22,76 +22,36 @@ jobs:
           echo "SSH_AUTH_SOCK=${SSH_AUTH_SOCK}" >> "${GITHUB_ENV}"
 
       - name: Delete obsolete files
-        if: env.SSH_AUTH_SOCK != null
+        # if: env.SSH_AUTH_SOCK != null
+        if: false
         run: |
           mkdir empty_folder
           echo 2.5.1 >> include_file.txt
           echo 2.5.1/manifest.json >> include_file.txt
-          echo 2.5.1/mixxx-2.6-alpha-174-g2c2dda9781-win64* >> include_file.txt
-          echo AzureCodeSigning >> include_file.txt
-          echo AzureCodeSigning/manifest.json >> include_file.txt
-          echo AzureCodeSigning/mixxx-2.6-alpha-* >> include_file.txt
-          echo CAStreamBasicDescription >> include_file.txt
-          echo CAStreamBasicDescription/manifest.json >> include_file.txt
-          echo CAStreamBasicDescription/mixxx-2.4.1-46-* >> include_file.txt
-          echo PR_13709 >> include_file.txt
-          echo PR_13709/manifest.json >> include_file.txt
-          echo PR_13709/mixxx-2.4.1-81-* >> include_file.txt
-          echo azure_signing_update >> include_file.txt
-          echo azure_signing_update/manifest.json >> include_file.txt
-          echo azure_signing_update/mixxx-2.4.1-61-* >> include_file.txt
-          echo chore >> include_file.txt
-          echo chore/upgrade-macos13-xcode15.2 >> include_file.txt
-          echo chore/upgrade-macos13-xcode15.2/manifest.json >> include_file.txt
-          echo chore/upgrade-macos13-xcode15.2/mixxx-2.6-alpha-76-* >> include_file.txt
-          echo daschuer-patch-1 >> include_file.txt
-          echo daschuer-patch-1/manifest.json >> include_file.txt
-          echo daschuer-patch-1/mixxx-2.6-alpha-284-* >> include_file.txt
-          echo dependabot >> include_file.txt
-          echo dependabot/github_actions >> include_file.txt
-          echo dependabot/github_actions/actions >> include_file.txt
-          echo dependabot/github_actions/actions/stale-6 >> include_file.txt
-          echo dependabot/github_actions/actions/stale-6/manifest.json >> include_file.txt
-          echo dependabot/github_actions/actions/stale-6/mixxx-2.4-alpha-1318-* >> include_file.txt
-          echo dependabot/github_actions/actions/upload-artifact-3.1.2 >> include_file.txt
-          echo dependabot/github_actions/actions/upload-artifact-3.1.2/manifest.json >> include_file.txt
-          echo dependabot/github_actions/actions/upload-artifact-3.1.2/mixxx-2.3.3-117-* >> include_file.txt
-          echo fix-14326 >> include_file.txt
-          echo fix-14326/manifest.json >> include_file.txt
-          echo fix-14326/mixxx-2.5.0-68-* >> include_file.txt
-          echo inpulse >> include_file.txt
-          echo inpulse/manifest.json >> include_file.txt
-          echo inpulse/mixxx-2.* >> include_file.txt
-          echo pr >> include_file.txt
-          echo pr/13709 >> include_file.txt
-          echo pr/13709/manifest.json >> include_file.txt
-          echo pr/13709/mixxx-2.4.1-81-* >> include_file.txt
-          echo resolve-from-urls-2.5 >> include_file.txt
-          echo resolve-from-urls-2.5/manifest.json >> include_file.txt
-          echo resolve-from-urls-2.5/mixxx-2.5-beta-100-* >> include_file.txt
-          echo revert-13208-gh13206 >> include_file.txt
-          echo revert-13208-gh13206/mixxx-2.4.1-5-gc71a48b76e-* >> include_file.txt
-          echo revert-13271-revert-13208-gh13206 >> include_file.txt
-          echo revert-13271-revert-13208-gh13206/mixxx-2.4.1-6-* >> include_file.txt
-          echo rg-use-opengl-node-and-add-shaders >> include_file.txt
-          echo rg-use-opengl-node-and-add-shaders/manifest.json >> include_file.txt
-          echo rg-use-opengl-node-and-add-shaders/mixxx-2.6-alpha-* >> include_file.txt
-          echo traktor-s3-updates >> include_file.txt
-          echo traktor-s3-updates/manifest.json >> include_file.txt
-          echo traktor-s3-updates/mixxx-2.6-alpha-* >> include_file.txt
-          echo ts_source_copy_check >> include_file.txt
-          echo ts_source_copy_check/manifest.json >> include_file.txt
-          echo ts_source_copy_check/mixxx-2.4.1-42-* >> include_file.txt
-          echo tsan-fix-13893 >> include_file.txt
-          echo tsan-fix-13893/manifest.json >> include_file.txt
-          echo tsan-fix-13893/mixxx-2.5-beta-83-* >> include_file.txt
-          echo tsan-fix-13895 >> include_file.txt
-          echo tsan-fix-13895/manifest.json >> include_file.txt
-          echo tsan-fix-13895/mixxx-2.5-beta-83-* >> include_file.txt
-          echo waveformwidgetinfo >> include_file.txt
-          echo waveformwidgetinfo/mixxx-2.5-alpha-3* >> include_file.txt
           rsync --verbose --archive --times --recursive --delete --include-from=include_file.txt --exclude=* "empty_folder/" "${SSH_USER}@${SSH_HOST}:${DESTDIR}/snapshots/"
         env:
           DESTDIR: public_html/downloads
           SSH_HOST: downloads-hostgator.mixxx.org
           SSH_USER: mixxx
+
+      - name: Remove folders
+        if: env.SSH_AUTH_SOCK != null
+        run: |
+          ssh "${SSH_USER}@${SSH_HOST}" "
+            set -euo pipefail
+            rm -rf \"${DESTDIR}/releases/2.5.4-3-g8d7a9c728a\"
+            rm -rf \"${DESTDIR}/releases/2.5.5\"
+            rm -rf \"${DESTDIR}/releases/2.7-alpha-215-g1666d06877\"
+            rm -rf \"${DESTDIR}/snapshots/borrowable_ptr\"
+            rm -rf \"${DESTDIR}/snapshots/ci\"
+            rm -f \"${DESTDIR}/snapshots/2.5/mixxx-2.5.5-macosarm.dmg\"
+            rm -f \"${DESTDIR}/snapshots/2.5/mixxx-2.5.5-macosarm.dmg.sha256sum\"
+            rm -f \"${DESTDIR}/snapshots/2.5/mixxx-2.5.5-macosintel.dmg\"
+            rm -f \"${DESTDIR}/snapshots/2.5/mixxx-2.5.5-macosintel.dmg.sha256sum\"
+            rm -f \"${DESTDIR}/snapshots/2.5/mixxx-2.5.5-win64.msi\"
+            rm -f \"${DESTDIR}/snapshots/2.5/mixxx-2.5.5-win64.msi.sha256sum\"
+          "
+        env:
+          DESTDIR: public_html/downloads
+          SSH_HOST: downloads-hostgator.mixxx.org
+          SSH_USER: mixxx

.github/workflows/release.yml

@@ -41,6 +41,8 @@ jobs:
       MACOS_CODESIGN_CERTIFICATE_P12_BASE64: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }}
       MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }}
       MACOS_NOTARIZATION_APP_SPECIFIC_PASSWORD: ${{ secrets.MACOS_NOTARIZATION_APP_SPECIFIC_PASSWORD }}
+      ANDROID_SIGNING_KEYSTORE_BASE64: ${{ secrets.ANDROID_SIGNING_KEYSTORE_BASE64 }}
+      ANDROID_SIGNING_PASSWORD: ${{ secrets.ANDROID_SIGNING_PASSWORD }}
       NETLIFY_BUILD_HOOK: ${{ secrets.NETLIFY_BUILD_HOOK }}
       RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY: ${{ secrets.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY }}
 

.pre-commit-config.yaml

@@ -125,10 +125,6 @@ repos:
     hooks:
       - id: prettier
         files: \.(d\.ts|ya?ml)$
-  - repo: https://github.com/qarmin/qml_formatter.git
-    rev: 37c2513b1b8275a475a160ed2f5b044910335d5f # No release tag yet including #6 fix
-    hooks:
-      - id: qml_formatter
   - repo: https://github.com/BlankSpruce/gersemi
     rev: 0.17.1
     hooks:
@@ -160,6 +156,17 @@ repos:
         language: python
         types: [text]
         files: ^CHANGELOG.md$
+      - id: qmlformat
+        name: qmlformat
+        entry: qmlformat
+        pass_filenames: true
+        require_serial: true
+        language: system
+        types: [text]
+        files: ^.*\.qml$
+        args: [-n, -i]
+        stages:
+          - manual
       - id: qmllint
         name: qmllint
         entry: qmllint
@@ -168,6 +175,8 @@ repos:
         language: system
         types: [text]
         files: ^.*\.qml$
+        stages:
+          - manual
       - id: metainfo
         name: metainfo
         description: Update AppStream metainfo releases from CHANGELOG.md.

.qmlformat.ini

@@ -0,0 +1,5 @@
+[General]
+IndentWidth=4
+NewlineType=native
+NormalizeOrder=true
+UseTabs=false