diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-09 15:36:02 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-11 01:11:47 +0100 |
| commit | da71c1c755b60a5f2544fd6708b97a8bc13f3679 (patch) | |
| tree | afc1afc875f3ff647b3c81170c3c830ea6e5ec87 /src/widgets/styles/qcommonstyle.cpp | |
| parent | 15db15d4483cb016d0c2629deac36e71f4dee189 (diff) | |
Introduce a QVariant themeHint() to QPlatformTheme.
Start on removing platform-specific code from QtWidgets.
Change-Id: Ic2163a0ce6f2db2151cdf7ca93766b2d861eeb55
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/widgets/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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; |