summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@nokia.com>2010-08-05 12:58:39 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-11-02 14:31:22 (GMT)
commita29718ed16885fd97caa8bdde9e949dd95b11e4b (patch)
treeb4069e31d2d4061d9adcbb32c60d4f003084986c /tests
parentead0c87a27a48881cb8fcf8319eb14f53e8a9bb1 (diff)
downloadQt-a29718ed16885fd97caa8bdde9e949dd95b11e4b.zip
Qt-a29718ed16885fd97caa8bdde9e949dd95b11e4b.tar.gz
Qt-a29718ed16885fd97caa8bdde9e949dd95b11e4b.tar.bz2
Fixed QMenuBar autotest. Changed window activation order.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qmenubar/tst_qmenubar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp
index 392a4a0..8dfb976 100644
--- a/tests/auto/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/qmenubar/tst_qmenubar.cpp
@@ -1702,8 +1702,8 @@ void tst_QMenuBar::taskQTBUG11823_crashwithInvisibleActions()
QAction * a = menubar.addAction( "&a" );
menubar.show();
- QApplication::setActiveWindow(&menubar);
QTest::qWaitForWindowShown(&menubar);
+ QApplication::setActiveWindow(&menubar);
menubar.setActiveAction(m);
QCOMPARE(menubar.activeAction(), m);
QTest::keyClick(0, Qt::Key_Right);