diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:02:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:02:35 +0200 |
| commit | ecaf7132fe47f3965cdf3e48a1c2d859f3911cd0 (patch) | |
| tree | 5d4045c65c51bd953dd6118bc6cc24f8c2c817bc /tests/auto/extras/data/tst_tumbler.qml | |
| parent | 1bc05eceb7823b38ddec1d8e874f371fb8b2045f (diff) | |
| parent | 59264fc24e3806a7e43379a2b8c610148f89cccb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I65f0f976bbf1a93240b109517ef09a33c62b6fb4
Diffstat (limited to 'tests/auto/extras/data/tst_tumbler.qml')
| -rw-r--r-- | tests/auto/extras/data/tst_tumbler.qml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/extras/data/tst_tumbler.qml index e3e444714..54365f14d 100644 --- a/tests/auto/extras/data/tst_tumbler.qml +++ b/tests/auto/extras/data/tst_tumbler.qml @@ -349,8 +349,7 @@ Item { var pos = Qt.point(columnXCenter(tumbler, 0), tumbler.__style.padding.top); mouseDrag(tumbler, pos.x, pos.y, 0, tumbler.height - tumbler.__style.padding.bottom, Qt.LeftButton, Qt.NoModifier, 300); - // See QTBUG-78471 - //tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 6.0 : 4.0); + tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 5.0 : 3.0); tumbler.height += 100; var padding = tumbler.__style.padding; |