diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/controls/Slider.qml | 2 | ||||
| -rw-r--r-- | src/controls/SpinBox.qml | 1 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_slider.qml | 2 | ||||
| -rw-r--r-- | tests/benchmarks/objectcount/objectcount.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/statusindicator/statusindicator.pro | 1 |
6 files changed, 6 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index a7b7ec16..061f0bbb 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop -MODULE_VERSION = 5.9.0 +MODULE_VERSION = 5.9.1 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/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index 999649b0..a742abd6 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -273,6 +273,7 @@ Control { Accessible.name: input.text Accessible.role: Accessible.SpinBox + Accessible.editable: true MouseArea { id: mouseArea 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) diff --git a/tests/benchmarks/objectcount/objectcount.pro b/tests/benchmarks/objectcount/objectcount.pro index f54d72d6..3e7f77e8 100644 --- a/tests/benchmarks/objectcount/objectcount.pro +++ b/tests/benchmarks/objectcount/objectcount.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_objectcount QT += quick testlib core-private -CONFIG += testcase +CONFIG += benchmark osx:CONFIG -= app_bundle SOURCES += \ diff --git a/tests/benchmarks/statusindicator/statusindicator.pro b/tests/benchmarks/statusindicator/statusindicator.pro index d66b5515..3770784a 100644 --- a/tests/benchmarks/statusindicator/statusindicator.pro +++ b/tests/benchmarks/statusindicator/statusindicator.pro @@ -1,6 +1,7 @@ TEMPLATE = app TARGET = tst_bench_statusindicator QT = core quick testlib +CONFIG += benchmark SOURCES += \ tst_statusindicator.cpp |