diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-03-25 10:11:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-25 10:11:02 +0100 |
| commit | cc7c4ba902ae6ab3b5eba80d7075ad8d6183a7ec (patch) | |
| tree | 3533a1dee0103a35e1881fe2e9c7a73f6f2d95de /src/controls/Private/qquickcontrolsettings.cpp | |
| parent | 76dd99c448ae69cb12a0465facc5dd743b94e624 (diff) | |
| parent | ff5d39f0a8f34cdb034df703e7b2a769c945e1ed (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/Private/qquickcontrolsettings.cpp')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index d89ffc1ea..e1d0cabb7 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -45,6 +45,8 @@ #include <qqmlengine.h> #include <qdir.h> #include <QTouchDevice> +#include <QGuiApplication> +#include <QStyleHints> QT_BEGIN_NAMESPACE @@ -175,5 +177,10 @@ qreal QQuickControlSettings::dpiScaleFactor() const return 1.0; } +qreal QQuickControlSettings::dragThreshold() const +{ + return qApp->styleHints()->startDragDistance(); +} + QT_END_NAMESPACE |