summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <aalpert@rim.com>2013-01-08 16:53:52 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-11 21:22:52 (GMT)
commita03d2b673ac488a71b5c5fb53114a610ec101cd4 (patch)
tree36e51b0344655e09c3109fca85fab0bdaf6c7dfb
parent5c49c33ab088a926577d3798ef90baac86e5794a (diff)
downloadQt-a03d2b673ac488a71b5c5fb53114a610ec101cd4.zip
Qt-a03d2b673ac488a71b5c5fb53114a610ec101cd4.tar.gz
Qt-a03d2b673ac488a71b5c5fb53114a610ec101cd4.tar.bz2
Stabilize tst_QDeclarativeMouseArea
Adding qWaitForWindowShown removes a potential source of instability. Change-Id: I6dc6ef13762d897b387ca9bc15a8a1f49c05bdf2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index f515444..0ad360e 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -535,6 +535,7 @@ void tst_QDeclarativeMouseArea::preventStealing()
canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/preventstealing.qml"));
canvas->show();
+ QTest::qWaitForWindowShown(canvas);
canvas->setFocus();
QVERIFY(canvas->rootObject() != 0);
@@ -673,6 +674,7 @@ void tst_QDeclarativeMouseArea::preventContextMenu()
QDeclarativeView *view = createView();
view->setSource(QUrl::fromLocalFile(SRCDIR "/data/preventContextMenu.qml"));
view->show();
+ QTest::qWaitForWindowShown(view);
QVERIFY(view->rootObject() != 0);
QDeclarativeProperty mouseAreaEnabled(view->rootObject(), "mouseAreaEnabled");