Upgrade to Qt6

.github/workflows/build.yml

@@ -67,9 +67,9 @@ jobs:
       - name: Configure
         run: |
           ccache --zero-stats
-          source /opt/qt5*/bin/qt5*-env.sh || true
           cmake -S . \
                 -B build \
+                -DWANT_QT6=ON \
                 $CMAKE_OPTS
       - name: Build
         run: cmake --build build
@@ -150,6 +150,7 @@ jobs:
           ccache --zero-stats
           cmake -S . \
                 -B build \
+                -DWANT_QT6=ON \
                 $CMAKE_OPTS
       - name: Build
         run: cmake --build build
@@ -183,9 +184,11 @@ jobs:
           - arch: x86_64
             os: macos-15-intel
             xcode: "16.4"
+            macosx_deployment_target: 10.15
           - arch: arm64
             os: macos-15
             xcode: "16.4"
+            macosx_deployment_target: 11.0
     name: macos-${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     env:
@@ -235,11 +238,12 @@ jobs:
       - name: Configure
         run: |
           ccache --zero-stats
-          source .github/workflows/macos-env.sh
           mkdir build
           cmake -S . \
                 -B build \
                 -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
+                -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.macosx_deployment_target }} \
+                -DWANT_QT6=ON \
                 $CMAKE_OPTS \
                 -DUSE_WERROR=OFF
       - name: Build
@@ -469,7 +473,7 @@ jobs:
       - name: Configure
         run: |
           /clang64/bin/ccache.exe --zero-stats
-          cmake -B build $CMAKE_OPTS
+          cmake -B build -DWANT_QT6=ON $CMAKE_OPTS
       - name: Build
         run: cmake --build build
       - name: Package

.github/workflows/deps-msys2-clangarm64.txt

@@ -14,8 +14,8 @@ mingw-w64-clang-aarch64-libsamplerate
 mingw-w64-clang-aarch64-libsndfile
 mingw-w64-clang-aarch64-lilv
 mingw-w64-clang-aarch64-lv2
-mingw-w64-clang-aarch64-qt5-base
-mingw-w64-clang-aarch64-qt5-svg
+mingw-w64-clang-aarch64-qt6-base
+mingw-w64-clang-aarch64-qt6-svg
 mingw-w64-clang-aarch64-suil
 mingw-w64-clang-aarch64-stk
 mingw-w64-clang-x86_64-nsis

.github/workflows/deps-ubuntu-24.04-gcc.txt

@@ -19,8 +19,9 @@ liblilv-dev
 liblist-moreutils-perl
 libmp3lame-dev
 libogg-dev
-libqt5svg5-dev
-libqt5x11extras5-dev
+libqt5widgets5
+libqt5x11extras5
+libqt6svg6-dev
 libsamplerate0-dev
 libsdl2-dev
 libsndfile1-dev
@@ -40,12 +41,12 @@ lv2-dev
 make
 perl
 portaudio19-dev
-qt5-qmake
-qtbase5-dev
-qtbase5-dev-tools
-qtbase5-private-dev
-qttools5-dev-tools
-qtwayland5
+qmake6
+qt6-base-dev
+qt6-base-dev-tools
+qt6-base-private-dev
+qt6-tools-dev-tools
+qt6-wayland
 software-properties-common
 ssh-client
 stk

Brewfile

@@ -15,6 +15,6 @@ brew "lilv"
 brew "lv2"
 brew "pkgconf"
 brew "portaudio"
-brew "qt@5"
+brew "qt@6"
 brew "sdl2"
 brew "stk"

CMakeLists.txt

@@ -192,6 +192,8 @@ endif()
 find_package(Qt${QT_VERSION_MAJOR} ${LMMS_QT_MIN_VERSION} COMPONENTS Core Gui Widgets Xml Svg REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools QUIET)
 
+message(STATUS "Qt version: ${Qt${QT_VERSION_MAJOR}_VERSION}")
+
 include_directories(SYSTEM
 	${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS}
 	${Qt${QT_VERSION_MAJOR}Gui_INCLUDE_DIRS}

cmake/linux/LinuxDeploy.cmake

@@ -152,6 +152,9 @@ file(COPY "${APP}/usr/share/icons/hicolor/256x256/apps/${lmms}.png" DESTINATION
 set(ENV{EXTRA_PLATFORM_PLUGINS} "libqwayland-generic.so")
 set(ENV{EXTRA_QT_MODULES} "waylandcompositor")
 
+# Inform linuxdeploy-plugin-qt which qt version to use
+set(ENV{QMAKE} "${CPACK_QMAKE_EXECUTABLE}")
+
 # Call linuxdeploy
 message(STATUS "Calling ${LINUXDEPLOY_BIN} --appdir \"${APP}\" ... [... libraries].")
 execute_process(COMMAND "${LINUXDEPLOY_BIN}"