summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-30 03:05:09 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-30 03:05:09 +0100
commit0ad5e87fc5b7d9ecef42ad376278858cad7e1973 (patch)
treed8ae02ec9ab2ae9f39c3db84d64472475d9b1c8f
parent782da4c2a05da0d5774bf75bdae0190b3d6c51f1 (diff)
parentdfd79afda5faf9e732f83715e11dc7aaf5cce164 (diff)
downloadqtquickcontrols-0ad5e87fc5b7d9ecef42ad376278858cad7e1973.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If74417371b0e4d0a7f2523e4e003420867e2f56e
-rw-r--r--tests/auto/extras/data/tst_tumbler.qml6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/extras/data/tst_tumbler.qml
index 6f207b4b..d2fa38b2 100644
--- a/tests/auto/extras/data/tst_tumbler.qml
+++ b/tests/auto/extras/data/tst_tumbler.qml
@@ -58,8 +58,8 @@ import "TestUtils.js" as TestUtils
Item {
id: container
- width: 200
- height: 200
+ width: 400
+ height: 400
TestCase {
id: testCase
@@ -123,7 +123,7 @@ Item {
waitForRendering(tumbler);
var pos = Qt.point(columnXCenter(tumbler, 0), tumbler.height / 2);
- mouseDrag(tumbler, pos.x, pos.y, 0, -tumbler.__style.__delegateHeight / 2, Qt.LeftButton, Qt.NoModifier, 200);
+ mouseDrag(tumbler, pos.x, pos.y, 0, -tumbler.__style.__delegateHeight, Qt.LeftButton, Qt.NoModifier, 200);
compare(tumbler.currentIndexAt(0), 1);
compare(column.currentIndex, 1);
}