@@ -87,7 +87,7 @@ QGnomePlatformTheme::QGnomePlatformTheme()
87
87
g_type_ensure (PANGO_TYPE_FONT_FAMILY);
88
88
g_type_ensure (PANGO_TYPE_FONT_FACE);
89
89
90
- #if QT_VERSION > 0x060000
90
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
91
91
// Load QGnomeTheme
92
92
m_platformTheme = QGenericUnixTheme::createUnixTheme (QLatin1String (" gnome" ));
93
93
#endif
@@ -175,7 +175,7 @@ QPlatformDialogHelper *QGnomePlatformTheme::createPlatformDialogHelper(QPlatform
175
175
}
176
176
}
177
177
178
- #if QT_VERSION < 0x060000
178
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
179
179
#ifndef QT_NO_SYSTEMTRAYICON
180
180
static bool isDBusTrayAvailable ()
181
181
{
@@ -196,7 +196,7 @@ static bool isDBusTrayAvailable()
196
196
#ifndef QT_NO_SYSTEMTRAYICON
197
197
QPlatformSystemTrayIcon *QGnomePlatformTheme::createPlatformSystemTrayIcon () const
198
198
{
199
- #if QT_VERSION < 0x060000
199
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
200
200
if (isDBusTrayAvailable ()) {
201
201
return new QDBusTrayIcon ();
202
202
}
@@ -209,7 +209,12 @@ QPlatformSystemTrayIcon *QGnomePlatformTheme::createPlatformSystemTrayIcon() con
209
209
}
210
210
#endif
211
211
212
- #if QT_VERSION > 0x060300
212
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
213
+ Qt::ColorScheme QGnomePlatformTheme::colorScheme () const
214
+ {
215
+ return GnomeSettings::getInstance ().useGtkThemeDarkVariant () ? Qt::ColorScheme::Dark : Qt::ColorScheme::Light;
216
+ }
217
+ #elif QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
213
218
QPlatformTheme::Appearance QGnomePlatformTheme::appearance () const
214
219
{
215
220
return GnomeSettings::getInstance ().useGtkThemeDarkVariant () ? Appearance::Dark : Appearance::Light;
0 commit comments