summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-05-12 07:24:39 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-05-12 07:24:39 (GMT)
commitad7988629c47a5fc1a671d36d9cdaed630f5e7f2 (patch)
tree1cabe38b5f26a33870e53145d896a8249fae48d5
parent814f7d3d607edacca091273302297b6b2674424f (diff)
downloadQt-ad7988629c47a5fc1a671d36d9cdaed630f5e7f2.zip
Qt-ad7988629c47a5fc1a671d36d9cdaed630f5e7f2.tar.gz
Qt-ad7988629c47a5fc1a671d36d9cdaed630f5e7f2.tar.bz2
Stabilize tst_QWidgetAction::visibilityUpdate
-rw-r--r--tests/auto/qwidgetaction/tst_qwidgetaction.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
index 5dfcd43..53dc4b5 100644
--- a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
+++ b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
@@ -51,6 +51,8 @@
#include <qmainwindow.h>
#include <qmenubar.h>
+#include "../../shared/util.h"
+
//TESTED_CLASS=
//TESTED_FILES=
@@ -190,8 +192,8 @@ void tst_QWidgetAction::visibilityUpdate()
QVERIFY(action->isVisible());
action->setVisible(false);
- QTest::qWait(100); //the call to hide is delayed by the toolbar layout
- QVERIFY(!combo->isVisible());
+ qApp->processEvents(); //the call to hide is delayed by the toolbar layout
+ QTRY_VERIFY(!combo->isVisible());
delete action;
// action also deletes combo