1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QGenericUnixTheme to provide themes

Browse Source 
This makes wayland platform plugin to use same platform themes as xcb
plugin, which also can load platform theme plugin for apps running in
Gnome.

Change-Id: I9f4e3504d153e26c5580d9e33443d8a11201cd52
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Jan Grulich 2019-07-31 07:58:21 +02:00 committed by Johan Helsing
parent e25bc957ff
commit 00a2ff93f6
1 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -98,38 +98,6 @@ QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
class GenericWaylandTheme: public QGenericUnixTheme
{
public:
static QStringList themeNames()
{
QStringList result;
if (QGuiApplication::desktopSettingsAware()) {
const QByteArray desktopEnvironment = QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment();
if (desktopEnvironment == QByteArrayLiteral("KDE")) {
#if QT_CONFIG(settings)
result.push_back(QStringLiteral("kde"));
#endif
} else if (!desktopEnvironment.isEmpty() &&
desktopEnvironment != QByteArrayLiteral("UNKNOWN") &&
desktopEnvironment != QByteArrayLiteral("GNOME") &&
desktopEnvironment != QByteArrayLiteral("UNITY") &&
desktopEnvironment != QByteArrayLiteral("MATE") &&
desktopEnvironment != QByteArrayLiteral("XFCE") &&
desktopEnvironment != QByteArrayLiteral("LXDE"))
// Ignore X11 desktop environments
result.push_back(QString::fromLocal8Bit(desktopEnvironment.toLower()));
}
if (result.isEmpty())
result.push_back(QLatin1String(QGenericUnixTheme::name));
return result;
}
};
QWaylandIntegration::QWaylandIntegration()
#if defined(Q_OS_MACOS)
: mFontDb(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>)
@ -302,12 +270,12 @@ QList<int> QWaylandIntegration::possibleKeys(const QKeyEvent *event) const
QStringList QWaylandIntegration::themeNames() const
{
return GenericWaylandTheme::themeNames();
return QGenericUnixTheme::themeNames();
}
QPlatformTheme *QWaylandIntegration::createPlatformTheme(const QString &name) const
{
return GenericWaylandTheme::createUnixTheme(name);
return QGenericUnixTheme::createUnixTheme(name);
}
// May be called from non-GUI threads