diff options
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/events/tst_touch.qml | 10 | ||||
| -rw-r--r-- | tests/auto/qmltest/listview/BLACKLIST | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/qmltest/events/tst_touch.qml b/tests/auto/qmltest/events/tst_touch.qml index 5b209a6d0b..fd603e5a71 100644 --- a/tests/auto/qmltest/events/tst_touch.qml +++ b/tests/auto/qmltest/events/tst_touch.qml @@ -35,6 +35,16 @@ MultiPointTouchArea { width: 100 height: 100 + // touchUpdatedSpy stores the QQuickTouchPoint, and in some cases + // MultiPointTouchArea can delete it out from under us. + // (test_simpleChain was failing because touchUpdatedSpy.signalArguments[0][0][0] + // ended up as an empty object somehow.) If we declare + // all the touchpoints that this test will use, that won't happen. + touchPoints: [ + TouchPoint { }, + TouchPoint { } + ] + SignalSpy { id: touchUpdatedSpy target: touchArea diff --git a/tests/auto/qmltest/listview/BLACKLIST b/tests/auto/qmltest/listview/BLACKLIST index ffb4f94e2c..62bf89128d 100644 --- a/tests/auto/qmltest/listview/BLACKLIST +++ b/tests/auto/qmltest/listview/BLACKLIST @@ -1,4 +1,3 @@ # Blacklist for testing [ListView::test_listInteractiveCurrentIndexEnforce] -linux -osx-10.12 +* |