From 994192643a9a17efb016c3231911cadef2a343b9 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Date: Tue, 19 Jun 2012 18:03:47 -0700
Subject: plastique: Use QPlatformTheme::DialogButtonBoxButtonsHaveIcons

Change-Id: I2f493d45820063ef62f16febde0df89a874dddb0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/widgets/styles/qplastiquestyle.cpp | 9 ++++++---
 1 file 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;
-- 
cgit v1.2.3