diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 19:44:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 19:44:14 (GMT) |
| commit | 1b906e167c4eec4a8b4e99f97faad3a0f095b51b (patch) | |
| tree | c17c809d6b96e19625116ff38fb21181e2f554a0 /tests | |
| parent | bfb6d648a548c25cdead72047ef0a712a45832ea (diff) | |
| parent | 149cfee3fea478640384559e69209a16bfda44a9 (diff) | |
| download | Qt-1b906e167c4eec4a8b4e99f97faad3a0f095b51b.zip Qt-1b906e167c4eec4a8b4e99f97faad3a0f095b51b.tar.gz Qt-1b906e167c4eec4a8b4e99f97faad3a0f095b51b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed QGesture autotest for QGesture lazy deletion.
Crash fix, when the Object will be deleted during handling a QGestureEvent.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gestures/tst_gestures.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/gestures/tst_gestures.cpp b/tests/auto/gestures/tst_gestures.cpp index 667cdd3..ee19125 100644 --- a/tests/auto/gestures/tst_gestures.cpp +++ b/tests/auto/gestures/tst_gestures.cpp @@ -1486,13 +1486,15 @@ void tst_Gestures::ungrabGesture() // a method on QWidget QVERIFY(customGestureA.data() != customGestureB.data()); a->ungrabGesture(CustomGesture::GestureType); - QVERIFY(customGestureA.isNull()); + //We changed the deletion of Gestures to lazy during QT-4022, so we can't ensure the QGesture is deleted until now QVERIFY(!customGestureB.isNull()); a->gestures.clear(); a->reset(); // send again to 'b' and make sure a never gets it. sendCustomGesture(&event, b); + //After all Gestures are processed in the QGestureManager, we can ensure the QGesture is now deleted + QVERIFY(customGestureA.isNull()); QCOMPARE(a->gestureEventsReceived, 0); QCOMPARE(a->gestureOverrideEventsReceived, 0); } |