Skip to content

Commit d86d6ba

Browse files
authored
Do not use "gtk3" key to avoid conflict with QGtkStyle from Qt upstream (#150)
1 parent 5f09f2f commit d86d6ba

4 files changed

+4
-4
lines changed

src/decoration/decorationplugin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
QWaylandAbstractDecoration *QGnomePlatformDecorationPlugin::create(const QString &key, const QStringList &paramList)
2424
{
2525
Q_UNUSED(paramList)
26-
if (key == "gnome" || key == "gtk3" || key == "qgnomeplatform")
26+
if (key == "gnome" || key == "qgnomeplatform")
2727
return new QGnomePlatformDecoration();
2828
return nullptr;
2929
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"Keys": [ "gnome", "gtk3", "qgnomeplatform" ]
2+
"Keys": [ "gnome", "qgnomeplatform" ]
33
}

src/theme/platformplugin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QGnomePlatformThemePlugin::QGnomePlatformThemePlugin(QObject *parent)
2727
QPlatformTheme *QGnomePlatformThemePlugin::create(const QString &key, const QStringList &paramList)
2828
{
2929
Q_UNUSED(paramList)
30-
if (key == "gnome" || key == "gtk3" || key == "qgnomeplatform")
30+
if (key == "gnome" || key == "qgnomeplatform")
3131
return new QGnomePlatformTheme();
3232
return nullptr;
3333
}

src/theme/qgnomeplatformtheme.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"Keys": [ "gnome", "gtk3", "qgnomeplatform" ]
2+
"Keys": [ "gnome", "qgnomeplatform" ]
33
}

0 commit comments

Comments
 (0)