diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-11-12 11:50:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-12 12:33:24 +0100 |
| commit | 46d302854e12ca05fe1932590628203b56a894ee (patch) | |
| tree | 25fa601a651c6973e33d7ab20a0769ae4f5f668b /src/platformsupport | |
| parent | 09d0f2d447191d207e5d1d8a74e36420dfc02382 (diff) | |
Avoid duplicate entries in QGenericUnixTheme::themeNames()
Change-Id: I6dc258274dc6614f56f306c30c95fe20c14fdf89
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index d219fbef4e..a39f26efc8 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -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)); |