Support Qt6

.gitlab-ci.yml

@@ -3,4 +3,5 @@
 
 include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml

CMakeLists.txt

@@ -36,15 +36,15 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX PULSEAUDIOQT
                         SOVERSION 3)
 
 set(REQUIRED_QT_VERSION 5.15.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui DBus)
+find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui DBus)
 
-find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG)
+find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG)
 set_package_properties(Qt5Test PROPERTIES DESCRIPTION "Autotests for PulseAudioQt" TYPE OPTIONAL)
 
-find_package(Qt5Qml ${REQUIRED_QT_VERSION} CONFIG)
+find_package(Qt${QT_MAJOR_VERSION}Qml ${REQUIRED_QT_VERSION} CONFIG)
 set_package_properties(Qt5Qml PROPERTIES DESCRIPTION "Tests for PulseAudioQt" TYPE OPTIONAL)
 
-find_package(Qt5Quick ${REQUIRED_QT_VERSION} CONFIG)
+find_package(Qt${QT_MAJOR_VERSION}Quick ${REQUIRED_QT_VERSION} CONFIG)
 set_package_properties(Qt5Quick PROPERTIES DESCRIPTION "Tests for PulseAudioQt" TYPE OPTIONAL)
 
 # create a Config.cmake and a ConfigVersion.cmake file and install them
@@ -94,7 +94,7 @@ install(EXPORT KF5PulseAudioQtTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" F
 
 install(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/pulseaudioqt_version.h
-        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
+        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel )
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 

autotests/CMakeLists.txt

@@ -6,5 +6,5 @@ ecm_add_test(
     ${CMAKE_BINARY_DIR}/src/debug.cpp
     mapstest.cpp
     TEST_NAME mapstest
-    LINK_LIBRARIES Qt5::Test KF5PulseAudioQt PkgConfig::LIBPULSE
+    LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5PulseAudioQt PkgConfig::LIBPULSE
 )

src/CMakeLists.txt

@@ -32,10 +32,10 @@ ecm_qt_declare_logging_category(KF5PulseAudioQt
 
 target_link_libraries(KF5PulseAudioQt
     PUBLIC
-        Qt5::Core
+        Qt${QT_MAJOR_VERSION}::Core
     PRIVATE
-        Qt5::Gui
-        Qt5::DBus
+        Qt${QT_MAJOR_VERSION}::Gui
+        Qt${QT_MAJOR_VERSION}::DBus
         PkgConfig::LIBPULSE
         PkgConfig::LIBPULSE_MAINLOOP
 )
@@ -98,7 +98,7 @@ if(BUILD_QCH)
         SOURCES
             ${PulseAudioQt_HEADERS}
         LINK_QCHS
-            Qt5Gui_QCH
+            Qt${QT_MAJOR_VERSION}Gui_QCH
         BLANK_MACROS
             PulseAudioQt_EXPORT
             PulseAudioQt_DEPRECATED

tests/painspector/CMakeLists.txt

@@ -2,13 +2,13 @@ set(painspector_SRCS
     main.cpp
 )
 
-qt5_add_resources(painspector_SRCS
+qt_add_resources(painspector_SRCS
     resources.qrc
 )
 
 add_executable(painspector ${painspector_SRCS})
 target_link_libraries(painspector
-    Qt5::Qml
-    Qt5::Quick
+    Qt${QT_MAJOR_VERSION}::Qml
+    Qt${QT_MAJOR_VERSION}::Quick
     KF5PulseAudioQt
 )