summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/controls/Slider.qml2
-rw-r--r--tests/auto/controls/data/tst_slider.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index bf54e93e..a90bc022 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -264,7 +264,7 @@ Control {
onPositionChanged: {
if (pressed)
- updateHandlePosition(mouse, preventStealing)
+ updateHandlePosition(mouse, !Settings.hasTouchScreen || preventStealing)
var point = mouseArea.mapToItem(fakeHandle, mouse.x, mouse.y)
handleHovered = fakeHandle.contains(Qt.point(point.x, point.y))
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 1d7e92d2..0eec7e34 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -339,7 +339,7 @@ Item {
// drag less than the threshold distance
mouseMove(control, pt.x + Settings.dragThreshold - 1, pt.y)
- compare(control.value, 0.5)
+ verify(control.value > 0.5)
// drag over the threshold
mouseMove(control, pt.x + Settings.dragThreshold + 1, pt.y)