diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-10 12:12:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-22 23:40:02 +0200 |
| commit | 1395b81935d590aa1a44c7d4857f788a06f6c794 (patch) | |
| tree | 71a098bac647cce61bef8d062c1e76380d999904 /tests/auto/other | |
| parent | f6155aec30c343edbad5ba12b189ca2d9c4904b5 (diff) | |
test: Remove QSKIP from tst_QFocusEvent::checkReason_ActiveWindow()
This test actually passes using the "xcb" platform and fails otherwise.
Second, the Jira task is misleading since it refers to
tst_QFocusEvent::checkReason_Shortcut()
Change-Id: Icab91ace8c214d958b534c5cebae900242522372
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/qfocusevent/tst_qfocusevent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp index 2b20c34d8b..a02462d7bd 100644 --- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp @@ -352,6 +352,8 @@ void tst_QFocusEvent::checkReason_ActiveWindow() QDialog* d = new QDialog( testFocusWidget ); d->show(); + QVERIFY(QTest::qWaitForWindowExposed(d)); + d->activateWindow(); // ### CDE QApplication::setActiveWindow(d); QVERIFY(QTest::qWaitForWindowActive(d)); @@ -373,8 +375,6 @@ void tst_QFocusEvent::checkReason_ActiveWindow() #ifdef Q_OS_MAC QEXPECT_FAIL("", "QTBUG-22815", Abort); #endif - if (QGuiApplication::platformName() == QStringLiteral("xcb")) - QSKIP("QTBUG-22815 - This test is unstable on this platform"); QTRY_VERIFY(childFocusWidgetOne->focusInEventRecieved); QVERIFY(childFocusWidgetOne->focusInEventGotFocus); |