Qt6: Drop support for QDbusTrayIcon for not being exported by Qt

FedoraQt · Nov 22, 2021 · b164b51 · b164b51
1 parent a7b181b
commit b164b51
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/theme/qgnomeplatformtheme.cpp b/src/theme/qgnomeplatformtheme.cpp
@@ -31,9 +31,11 @@
 #include <gtk-3.0/gtk/gtk.h>
 #define signals Q_SIGNALS
 
+#if QT_VERSION < 0x060000
 #ifndef QT_NO_SYSTEMTRAYICON
 #include <private/qdbustrayicon_p.h>
 #endif
+#endif
 
 QGnomePlatformTheme::QGnomePlatformTheme()
 {
@@ -109,6 +111,7 @@ QPlatformDialogHelper *QGnomePlatformTheme::createPlatformDialogHelper(QPlatform
     }
 }
 
+#if QT_VERSION < 0x060000
 #ifndef QT_NO_SYSTEMTRAYICON
 static bool isDBusTrayAvailable() {
     static bool dbusTrayAvailable = false;
@@ -123,13 +126,16 @@ static bool isDBusTrayAvailable() {
     return dbusTrayAvailable;
 }
 #endif
+#endif
 
 #ifndef QT_NO_SYSTEMTRAYICON
 QPlatformSystemTrayIcon* QGnomePlatformTheme::createPlatformSystemTrayIcon() const
 {
+#if QT_VERSION < 0x060000
     if (isDBusTrayAvailable()) {
         return new QDBusTrayIcon();
     }
+#endif
     return Q_NULLPTR;
 }
 #endif