diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-08 22:54:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-08 22:54:48 (GMT) |
| commit | 1b08e9bf28ba4f2c49b9240abc59f805802bdc1d (patch) | |
| tree | b2c865a6feec197a0034a7b82a2cd43e2a025ff6 /tests/auto/qcompleter | |
| parent | d29c604b0365dfbc20f8aea8d2cb63f621995219 (diff) | |
| parent | f52dc5bf1e885c9a4d226c2484249e7d9faf0a99 (diff) | |
| download | Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.zip Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.tar.gz Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'tests/auto/qcompleter')
| -rw-r--r-- | tests/auto/qcompleter/tst_qcompleter.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp index 928d826..7eefb26 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/qcompleter/tst_qcompleter.cpp @@ -1025,6 +1025,7 @@ void tst_QCompleter::multipleWidgets() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&window); #endif + QApplication::setActiveWindow(&window); QTest::qWait(50); QTRY_VERIFY(qApp->focusWidget() == comboBox); comboBox->lineEdit()->setText("it"); @@ -1058,6 +1059,7 @@ void tst_QCompleter::focusIn() window.show(); QTest::qWait(100); window.activateWindow(); + QApplication::setActiveWindow(&window); QTest::qWait(100); QTRY_COMPARE(qApp->activeWindow(), &window); @@ -1322,8 +1324,10 @@ void tst_QCompleter::task253125_lineEditCompletion() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&edit); #endif + QTest::qWait(10); + QApplication::setActiveWindow(&edit); + QTRY_COMPARE(QApplication::activeWindow(), &edit); - QTest::qWait(100); QTest::keyClick(&edit, 'i'); QCOMPARE(edit.completer()->currentCompletion(), QString("iota")); QTest::keyClick(edit.completer()->popup(), Qt::Key_Down); @@ -1358,7 +1362,9 @@ void tst_QCompleter::task247560_keyboardNavigation() qt_x11_wait_for_window_manager(&edit); #endif - QTest::qWait(100); + QTest::qWait(10); + QApplication::setActiveWindow(&edit); + QTRY_COMPARE(QApplication::activeWindow(), &edit); QTest::keyClick(&edit, 'r'); QTest::keyClick(edit.completer()->popup(), Qt::Key_Down); |