summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@nokia.com>2010-11-15 12:08:03 (GMT)
committerDominik Holland <dominik.holland@nokia.com>2010-11-15 12:09:30 (GMT)
commit149cfee3fea478640384559e69209a16bfda44a9 (patch)
treea4aa8fa4133160717ef8d81b61b434b1f4d205bf /tests
parentab743885e66a970a3425d97c6547ce995de3f64f (diff)
downloadQt-149cfee3fea478640384559e69209a16bfda44a9.zip
Qt-149cfee3fea478640384559e69209a16bfda44a9.tar.gz
Qt-149cfee3fea478640384559e69209a16bfda44a9.tar.bz2
Fixed QGesture autotest for QGesture lazy deletion.
Reviewed By: Trust Me
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gestures/tst_gestures.cpp4
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);
}