diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-06-19 18:03:47 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 15:45:07 +0200 |
| commit | 994192643a9a17efb016c3231911cadef2a343b9 (patch) | |
| tree | 400d21370ee4b6d8df7c2ab0949b1b74bc04906c | |
| parent | 00a4dd2a6f270653e16049c6b221a16960cad82a (diff) | |
plastique: Use QPlatformTheme::DialogButtonBoxButtonsHaveIcons
Change-Id: I2f493d45820063ef62f16febde0df89a874dddb0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/widgets/styles/qplastiquestyle.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/widgets/styles/qplastiquestyle.cpp b/src/widgets/styles/qplastiquestyle.cpp index 51c6c441d0..c2b4d4c12c 100644 --- a/src/widgets/styles/qplastiquestyle.cpp +++ b/src/widgets/styles/qplastiquestyle.cpp @@ -87,6 +87,8 @@ static const int blueFrameWidth = 2; // with of line edit focus frame #include <qvarlengtharray.h> #include <limits.h> #include <private/qstylehelper_p.h> +#include <qpa/qplatformtheme.h> +#include <private/qguiapplication_p.h> QT_BEGIN_NAMESPACE @@ -5340,11 +5342,12 @@ int QPlastiqueStyle::styleHint(StyleHint hint, const QStyleOption *option, const case SH_Menu_SubMenuPopupDelay: ret = 96; // from Plastik break; -#ifdef Q_WS_X11 case SH_DialogButtonBox_ButtonsHaveIcons: - ret = true; + if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) + ret = theme->themeHint(QPlatformTheme::DialogButtonBoxButtonsHaveIcons).toBool(); + else + ret = true; break; -#endif #ifndef Q_OS_WIN case SH_Menu_AllowActiveAndDisabled: ret = false; |