From da71c1c755b60a5f2544fd6708b97a8bc13f3679 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 9 Jan 2012 15:36:02 +0100
Subject: Introduce a QVariant themeHint() to QPlatformTheme.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Start on removing platform-specific code from QtWidgets.

Change-Id: Ic2163a0ce6f2db2151cdf7ca93766b2d861eeb55
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/widgets/styles/qcommonstyle.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/widgets/styles/qcommonstyle.cpp')

diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 10c2dedaeb..c874770fdb 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -44,6 +44,7 @@
 
 #include <qfile.h>
 #include <qapplication.h>
+#include <private/qguiapplication_p.h>
 #include <qbitmap.h>
 #include <qcache.h>
 #include <qdockwidget.h>
@@ -72,6 +73,7 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <qsettings.h>
+#include <qvariant.h>
 #include <qpixmapcache.h>
 #include <private/qguiplatformplugin_p.h>
 
@@ -4313,7 +4315,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
 #endif
     case PM_MaximumDragDistance:
-        ret = -1;
+        ret = QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::MaximumScrollBarDragDistance).toInt();
         break;
 
 #ifndef QT_NO_SLIDER
@@ -4550,7 +4552,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         }
         break;
     case PM_TextCursorWidth:
-        ret = 1;
+        ret = QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::TextCursorWidth).toInt();
         break;
     case PM_TabBar_ScrollButtonOverlap:
         ret = 1;
-- 
cgit v1.2.3