diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 15:04:15 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-10-02 17:24:58 +0000 |
commit | 925d6eff3e8e5bc801210a67ec4cf1d4b3492fc2 (patch) | |
tree | a03f381e4823e29b2e50c1a80588f06e450656fc /src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | |
parent | a3292031295a09e5e959141db78c2310e08562ae (diff) | |
parent | d0eaa737e10aed34c09ba753e21c3e027b5ce58c (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/platformsupport/themes/genericunix/qgenericunixthemes.cpp')
-rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index cd38498217..a369747a64 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -243,8 +243,13 @@ void QKdeThemePrivate::refresh() toolButtonStyle = Qt::ToolButtonTextBesideIcon; toolBarIconSize = 0; styleNames.clear(); + if (kdeVersion >= 5) + styleNames << QStringLiteral("breeze"); styleNames << QStringLiteral("Oxygen") << QStringLiteral("fusion") << QStringLiteral("windows"); - iconFallbackThemeName = iconThemeName = QStringLiteral("oxygen"); + if (kdeVersion >= 5) + iconFallbackThemeName = iconThemeName = QStringLiteral("breeze"); + else + iconFallbackThemeName = iconThemeName = QStringLiteral("oxygen"); QHash<QString, QSettings*> kdeSettings; |