diff options
author | Janne Anttila <janne.anttila@digia.com> | 2009-09-24 10:23:50 (GMT) |
---|---|---|
committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-24 10:23:50 (GMT) |
commit | 135e02d11becc8ee434524756d85221244c185ee (patch) | |
tree | b9acabb3424321fa3eb5f6390e0f87c3fdee91f7 /tests/auto/qspinbox/tst_qspinbox.cpp | |
parent | 39d0ded8f6e94df2a08876ee1cf00253ef2b7de3 (diff) | |
parent | d57e2f4d01534f44dde629b71398783777fdad4e (diff) | |
download | Qt-135e02d11becc8ee434524756d85221244c185ee.zip Qt-135e02d11becc8ee434524756d85221244c185ee.tar.gz Qt-135e02d11becc8ee434524756d85221244c185ee.tar.bz2 |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qspinbox/tst_qspinbox.cpp')
-rw-r--r-- | tests/auto/qspinbox/tst_qspinbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/qspinbox/tst_qspinbox.cpp index 80f185a..69347c4 100644 --- a/tests/auto/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/qspinbox/tst_qspinbox.cpp @@ -752,8 +752,8 @@ void tst_QSpinBox::editingFinished() testFocusWidget->show(); QApplication::setActiveWindow(testFocusWidget); + QTest::qWaitForWindowShown(testFocusWidget); box->activateWindow(); - QTest::qWait(100);//qApp->processEvents(); box->setFocus(); QTRY_COMPARE(qApp->focusWidget(), box); |