diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2012-09-21 12:28:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-25 18:36:01 +0200 |
| commit | 01a985ac5bcc843ef44091d7f272a7c10bee989c (patch) | |
| tree | d8a4958ac619e97005bd2301d2c521500de4cbf7 /tests/auto/widgets/widgets | |
| parent | 461a01c1df88cdea0e8109948d125fc58a185cf8 (diff) | |
Test: Remove QSKIP from tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut
The test is passing on Ubuntu 11.10.
Adding qWaitForWindowExposed after the line edit show() call to ensure
the line edit is actually shown on the screen.
Task-number: QTBUG-24518
Change-Id: I2af65bef76d171b36032120738dfbd7cfff51d7f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qlineedit/qlineedit.pro | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro index b4ab72e96a..40eff1f968 100644 --- a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro +++ b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro @@ -3,6 +3,4 @@ TARGET = tst_qlineedit QT += gui-private core-private widgets widgets-private testlib SOURCES += tst_qlineedit.cpp -# QTBUG-24518 - unstable test -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 4dc8cbb31e..9254e82532 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -3635,9 +3635,6 @@ void tst_QLineEdit::taskQTBUG_7902_contextMenuCrash() void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut() { -#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__) - QSKIP("QTBUG-24518 - Unstable test for Ubuntu 11.10"); -#endif //ReadOnly QLineEdit should not intercept shortcut. QLineEdit le; le.setReadOnly(true); @@ -3648,6 +3645,7 @@ void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut() le.addAction(&action); le.show(); + QVERIFY(QTest::qWaitForWindowExposed(&le)); QApplication::setActiveWindow(&le); QVERIFY(QTest::qWaitForWindowActive(&le)); le.setFocus(); |