summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-07 03:02:46 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-07 03:02:46 +0100
commitb9251c72a19d67c89a8fe8ee8799e59f7f79c5cc (patch)
treefd2f296e4d497488549cf260a068169d1e0b9f06
parent0c8daab3cba92dd27904a8cdd437735be631c263 (diff)
parent0ad5e87fc5b7d9ecef42ad376278858cad7e1973 (diff)
downloadqtquickcontrols-b9251c72a19d67c89a8fe8ee8799e59f7f79c5cc.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I2ccffea822f00b4437c1ca56a421ad868e87103d
-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);
}