AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid duplicate entries in QGenericUnixTheme::themeNames()

Browse Source 
Change-Id: I6dc258274dc6614f56f306c30c95fe20c14fdf89
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
This commit is contained in:
J-P Nurmi 2012-11-12 11:50:07 +01:00 committed by The Qt Project
parent 09d0f2d447
commit 46d302854e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
View File

@ -427,9 +427,9 @@ QStringList QGenericUnixTheme::themeNames()
} else if (QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment() == QByteArray("GNOME")) {
result.push_back(QLatin1String(QGnomeTheme::name));
}
const QByteArray session = qgetenv("DESKTOP_SESSION");
if (!session.isEmpty() && session != "default")
result.push_back(QString::fromLocal8Bit(session));
const QString session = QString::fromLocal8Bit(qgetenv("DESKTOP_SESSION"));
if (!session.isEmpty() && session != QStringLiteral("default") && !result.contains(session))
result.push_back(session);
} // desktopSettingsAware
if (result.isEmpty())
result.push_back(QLatin1String(QGenericUnixTheme::name));