diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-13 08:43:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-13 08:43:32 +0100 |
| commit | 57aa9580f07307c5e277e52362943e7efd1f9ac9 (patch) | |
| tree | b638b0637283fe00a1f9a173a8d2a03adab9e0d2 /src/quicktemplates2/qquickslider.cpp | |
| parent | 5b18141e1165e24d2f3909548772916bea5faf10 (diff) | |
| parent | 5c2b1bee5258981800c623dc3f054b15d7875484 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I32562a4aa6ca3090b28f624d675024f6b717bedb
Diffstat (limited to 'src/quicktemplates2/qquickslider.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickslider.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index 9b922215..86e2445a 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -717,18 +717,7 @@ void QQuickSlider::mousePressEvent(QMouseEvent *event) Q_D(QQuickSlider); QQuickControl::mousePressEvent(event); d->handleMove(event->localPos()); -} - -void QQuickSlider::mouseMoveEvent(QMouseEvent *event) -{ - Q_D(QQuickSlider); - if (!keepMouseGrab()) { - if (d->orientation == Qt::Horizontal) - setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->localPos().x() - d->pressPoint.x(), Qt::XAxis, event)); - else - setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->localPos().y() - d->pressPoint.y(), Qt::YAxis, event)); - } - QQuickControl::mouseMoveEvent(event); + setKeepMouseGrab(true); } #if QT_CONFIG(quicktemplates2_multitouch) |