summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2019-04-27 07:26:27 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2019-04-27 05:41:35 +0000
commit3ef2b2727df42510512669ec879788d41d83cebb (patch)
treef8ed414a1d290dc2301c4f212fba9116b5b57d92 /tests
parent5d45aa1a6400b9fdb9bafa0559675996aff5e58a (diff)
Stabilize tst_QQuickWheelHandler's activeChangedSpy checks
Change-Id: I9fa36d12347f0311728dc14ab4b8405bf0550505 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/pointerhandlers/qquickwheelhandler/data/nested.qml4
-rw-r--r--tests/auto/quick/pointerhandlers/qquickwheelhandler/data/rectWheel.qml4
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/nested.qml b/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/nested.qml
index 3243515180..49e44f2b1f 100644
--- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/nested.qml
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/nested.qml
@@ -47,8 +47,8 @@ Rectangle {
WheelHandler {
id: innerWheelHandler
objectName: "innerWheelHandler"
- // should deactivate because events go to the outer handler, not because of timeout
- activeTimeout: 1
+ // TODO should ideally deactivate because events go to the outer handler, not because of timeout
+ activeTimeout: 0.5
property: "x"
}
}
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/rectWheel.qml b/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/rectWheel.qml
index b2272a57c2..d4875d5313 100644
--- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/rectWheel.qml
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/data/rectWheel.qml
@@ -39,5 +39,7 @@ Rectangle {
}
}
- WheelHandler { }
+ WheelHandler {
+ activeTimeout: 0.5
+ }
}