Enable dbusmenu-qt with Qt 6

external/CMakeLists.txt

@@ -14,7 +14,7 @@ endmacro()
 add_checked_subdirectory(angle)
 add_checked_subdirectory(auto_updates)
 add_checked_subdirectory(crash_reports)
-if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION AND NOT DESKTOP_APP_QT6)
+if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     add_checked_subdirectory(dbusmenu_qt)
 endif()
 add_checked_subdirectory(expected)
@@ -59,7 +59,7 @@ add_checked_subdirectory(qr_code_generator)
 add_checked_subdirectory(ranges)
 add_checked_subdirectory(rlottie)
 add_checked_subdirectory(rnnoise)
-if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION AND NOT DESKTOP_APP_QT6)
+if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     add_checked_subdirectory(statusnotifieritem)
 endif()
 add_checked_subdirectory(ton)

external/dbusmenu_qt/CMakeLists.txt

@@ -7,7 +7,7 @@
 add_library(external_dbusmenu_qt INTERFACE IMPORTED GLOBAL)
 add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt)
 
-if (DESKTOP_APP_USE_PACKAGED)
+if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_QT6)
     if (DESKTOP_APP_USE_PACKAGED_LAZY)
         find_package(dbusmenu-qt5 QUIET)
     else()
@@ -48,11 +48,19 @@ if (NOT dbusmenu-qt5_FOUND)
         utils.cpp
     )
 
-    qt5_add_dbus_adaptor(dbusmenu_adaptor
-        ${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml
-        ${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h
-        DBusMenuExporterDBus
-    )
+    if (DESKTOP_APP_QT6)
+        qt6_add_dbus_adaptor(dbusmenu_adaptor
+            ${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml
+            ${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h
+            DBusMenuExporterDBus
+        )
+    else()
+        qt5_add_dbus_adaptor(dbusmenu_adaptor
+            ${dbusmenu_qt_loc}/com.canonical.dbusmenu.xml
+            ${dbusmenu_qt_loc}/dbusmenuexporterdbus_p.h
+            DBusMenuExporterDBus
+        )
+    endif()
 
     target_sources(external_dbusmenu_qt_bundled PRIVATE ${dbusmenu_adaptor})
 

external/statusnotifieritem/CMakeLists.txt

@@ -18,11 +18,19 @@ PRIVATE
     statusnotifieritem.h
 )
 
-qt5_add_dbus_adaptor(sni_adaptor
-    ${statusnotifieritem_loc}/org.kde.StatusNotifierItem.xml
-    ${statusnotifieritem_loc}/statusnotifieritem.h
-    StatusNotifierItem
-)
+if (DESKTOP_APP_QT6)
+    qt6_add_dbus_adaptor(sni_adaptor
+        ${statusnotifieritem_loc}/org.kde.StatusNotifierItem.xml
+        ${statusnotifieritem_loc}/statusnotifieritem.h
+        StatusNotifierItem
+    )
+else()
+    qt5_add_dbus_adaptor(sni_adaptor
+        ${statusnotifieritem_loc}/org.kde.StatusNotifierItem.xml
+        ${statusnotifieritem_loc}/statusnotifieritem.h
+        StatusNotifierItem
+    )
+endif()
 
 set_target_properties(external_statusnotifieritem PROPERTIES AUTOMOC ON)