Add option to compile with Qt 6

src/CMakeLists.txt

@@ -552,31 +552,63 @@ if(UNIX AND HAVE_DBUS)
     HEADERS device/udisks2lister.h
   )
 
-  # MPRIS 2.0 DBUS interfaces
-  qt5_add_dbus_adaptor(SOURCES
-      dbus/org.mpris.MediaPlayer2.Player.xml
-      core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player)
-  qt5_add_dbus_adaptor(SOURCES
-      dbus/org.mpris.MediaPlayer2.xml
-      core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root)
-  qt5_add_dbus_adaptor(SOURCES
-      dbus/org.mpris.MediaPlayer2.TrackList.xml
-      core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList)
+  if (WITH_QT6)
 
-  # MPRIS 2.1 DBUS interfaces
-  qt5_add_dbus_adaptor(SOURCES
-      dbus/org.mpris.MediaPlayer2.Playlists.xml
-      core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
+    # MPRIS 2.0 DBUS interfaces
+    qt6_add_dbus_adaptor(SOURCES
+        dbus/org.mpris.MediaPlayer2.Player.xml
+        core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player)
+    qt6_add_dbus_adaptor(SOURCES
+        dbus/org.mpris.MediaPlayer2.xml
+        core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root)
+    qt6_add_dbus_adaptor(SOURCES
+        dbus/org.mpris.MediaPlayer2.TrackList.xml
+        core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList)
 
-  # org.freedesktop.Notifications DBUS interface
-  qt5_add_dbus_interface(SOURCES
-      dbus/org.freedesktop.Notifications.xml
-      dbus/notification)
+    # MPRIS 2.1 DBUS interfaces
+    qt6_add_dbus_adaptor(SOURCES
+        dbus/org.mpris.MediaPlayer2.Playlists.xml
+        core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
 
-  # org.gnome.SettingsDaemon interface
-  qt5_add_dbus_interface(SOURCES
-      dbus/org.gnome.SettingsDaemon.MediaKeys.xml
-      dbus/gnomesettingsdaemon)
+    # org.freedesktop.Notifications DBUS interface
+    qt6_add_dbus_interface(SOURCES
+        dbus/org.freedesktop.Notifications.xml
+        dbus/notification)
+
+    # org.gnome.SettingsDaemon interface
+    qt6_add_dbus_interface(SOURCES
+        dbus/org.gnome.SettingsDaemon.MediaKeys.xml
+        dbus/gnomesettingsdaemon)
+
+  else()
+
+    # MPRIS 2.0 DBUS interfaces
+    qt5_add_dbus_adaptor(SOURCES
+        dbus/org.mpris.MediaPlayer2.Player.xml
+        core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player)
+    qt5_add_dbus_adaptor(SOURCES
+        dbus/org.mpris.MediaPlayer2.xml
+        core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root)
+    qt5_add_dbus_adaptor(SOURCES
+        dbus/org.mpris.MediaPlayer2.TrackList.xml
+        core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList)
+
+    # MPRIS 2.1 DBUS interfaces
+    qt5_add_dbus_adaptor(SOURCES
+        dbus/org.mpris.MediaPlayer2.Playlists.xml
+        core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
+
+    # org.freedesktop.Notifications DBUS interface
+    qt5_add_dbus_interface(SOURCES
+        dbus/org.freedesktop.Notifications.xml
+        dbus/notification)
+
+    # org.gnome.SettingsDaemon interface
+    qt5_add_dbus_interface(SOURCES
+        dbus/org.gnome.SettingsDaemon.MediaKeys.xml
+        dbus/gnomesettingsdaemon)
+
+  endif()
 
   # org.freedesktop.Avahi.Server interface
   add_custom_command(
@@ -617,21 +649,39 @@ if(UNIX AND HAVE_DBUS)
            PROPERTIES NO_NAMESPACE dbus/udisks2drive INCLUDE dbus/metatypes.h)
        set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml
            PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h)
-       qt5_add_dbus_interface(SOURCES
-           dbus/org.freedesktop.DBus.ObjectManager.xml
-           dbus/objectmanager)
-       qt5_add_dbus_interface(SOURCES
-           dbus/org.freedesktop.UDisks2.Filesystem.xml
-           dbus/udisks2filesystem)
-       qt5_add_dbus_interface(SOURCES
-           dbus/org.freedesktop.UDisks2.Block.xml
-           dbus/udisks2block)
-       qt5_add_dbus_interface(SOURCES
-           dbus/org.freedesktop.UDisks2.Drive.xml
-           dbus/udisks2drive)
-       qt5_add_dbus_interface(SOURCES
-           dbus/org.freedesktop.UDisks2.Job.xml
-           dbus/udisks2job)
+       if(WITH_QT6)
+         qt6_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.DBus.ObjectManager.xml
+             dbus/objectmanager)
+         qt6_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.UDisks2.Filesystem.xml
+             dbus/udisks2filesystem)
+         qt6_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.UDisks2.Block.xml
+             dbus/udisks2block)
+         qt6_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.UDisks2.Drive.xml
+             dbus/udisks2drive)
+         qt6_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.UDisks2.Job.xml
+             dbus/udisks2job)
+       else()
+         qt5_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.DBus.ObjectManager.xml
+             dbus/objectmanager)
+         qt5_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.UDisks2.Filesystem.xml
+             dbus/udisks2filesystem)
+         qt5_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.UDisks2.Block.xml
+             dbus/udisks2block)
+         qt5_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.UDisks2.Drive.xml
+             dbus/udisks2drive)
+         qt5_add_dbus_interface(SOURCES
+             dbus/org.freedesktop.UDisks2.Job.xml
+             dbus/udisks2job)
+         endif()
    endif(HAVE_UDISKS2)
 
 endif(UNIX AND HAVE_DBUS)
@@ -872,9 +922,15 @@ optional_source(HAVE_MOODBAR
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
-qt5_wrap_cpp(MOC ${HEADERS})
-qt5_wrap_ui(UIC ${UI})
-qt5_add_resources(QRC ${RESOURCES})
+if(WITH_QT6)
+  qt6_wrap_cpp(MOC ${HEADERS})
+  qt6_wrap_ui(UIC ${UI})
+  qt6_add_resources(QRC ${RESOURCES})
+else()
+  qt5_wrap_cpp(MOC ${HEADERS})
+  qt5_wrap_ui(UIC ${UI})
+  qt5_add_resources(QRC ${RESOURCES})
+endif()
 
 if(HAVE_TRANSLATIONS)