diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
| commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
| tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /src/platformsupport | |
| parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
| parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/platformsupport.pro | 1 | ||||
| -rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 5cb883355b..57d9b422f4 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,4 +1,3 @@ -load(qt_build_config) TARGET = QtPlatformSupport QT = core-private gui-private diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index 2d0139f0e5..d219fbef4e 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -130,7 +130,7 @@ QVariant QGenericUnixTheme::themeHint(ThemeHint hint) const return QVariant(true); case QPlatformTheme::StyleNames: { QStringList styleNames; - styleNames << QStringLiteral("Plastique") << QStringLiteral("Windows"); + styleNames << QStringLiteral("Fusion") << QStringLiteral("Windows"); return QVariant(styleNames); } case QPlatformTheme::KeyboardScheme: @@ -225,7 +225,7 @@ void QKdeTheme::refresh() m_toolButtonStyle = Qt::ToolButtonTextBesideIcon; m_toolBarIconSize = 0; m_styleNames.clear(); - m_styleNames << QStringLiteral("Oxygen") << QStringLiteral("plastique") << QStringLiteral("windows"); + m_styleNames << QStringLiteral("Oxygen") << QStringLiteral("fusion") << QStringLiteral("windows"); m_iconFallbackThemeName = m_iconThemeName = QStringLiteral("oxygen"); // Read settings file. |