Skip to content

Commit b164b51

Browse files
committed
Qt6: Drop support for QDbusTrayIcon for not being exported by Qt
1 parent a7b181b commit b164b51

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/theme/qgnomeplatformtheme.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@
3131
#include <gtk-3.0/gtk/gtk.h>
3232
#define signals Q_SIGNALS
3333

34+
#if QT_VERSION < 0x060000
3435
#ifndef QT_NO_SYSTEMTRAYICON
3536
#include <private/qdbustrayicon_p.h>
3637
#endif
38+
#endif
3739

3840
QGnomePlatformTheme::QGnomePlatformTheme()
3941
{
@@ -109,6 +111,7 @@ QPlatformDialogHelper *QGnomePlatformTheme::createPlatformDialogHelper(QPlatform
109111
}
110112
}
111113

114+
#if QT_VERSION < 0x060000
112115
#ifndef QT_NO_SYSTEMTRAYICON
113116
static bool isDBusTrayAvailable() {
114117
static bool dbusTrayAvailable = false;
@@ -123,13 +126,16 @@ static bool isDBusTrayAvailable() {
123126
return dbusTrayAvailable;
124127
}
125128
#endif
129+
#endif
126130

127131
#ifndef QT_NO_SYSTEMTRAYICON
128132
QPlatformSystemTrayIcon* QGnomePlatformTheme::createPlatformSystemTrayIcon() const
129133
{
134+
#if QT_VERSION < 0x060000
130135
if (isDBusTrayAvailable()) {
131136
return new QDBusTrayIcon();
132137
}
138+
#endif
133139
return Q_NULLPTR;
134140
}
135141
#endif

0 commit comments

Comments
 (0)