diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 14:03:21 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 14:03:21 +0200 |
commit | 1866c13b7dd48aa0c6ede1cf7907a2640e9399f8 (patch) | |
tree | 0b61c2d801525228f4c5795795d1cdeb57b3edfa /tests/auto/widgets/widgets | |
parent | 5b648d4d79d07a7c851ce6211ffff8375d41bfa2 (diff) | |
parent | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (diff) |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/widgets/widgets')
-rw-r--r-- | tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 3fa669c1fb..d428e2705d 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -3673,8 +3673,6 @@ void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut() void tst_QLineEdit::QTBUG697_paletteCurrentColorGroup() { - if (m_keyboardScheme != QPlatformTheme::X11KeyboardScheme) - QSKIP("Only tested on X11"); QLineEdit le; le.setText(" "); QPalette p = le.palette(); @@ -3692,7 +3690,12 @@ void tst_QLineEdit::QTBUG697_paletteCurrentColorGroup() QImage img(le.size(),QImage::Format_ARGB32 ); le.render(&img); QCOMPARE(img.pixel(10, le.height()/2), QColor(Qt::green).rgb()); - QApplication::setActiveWindow(0); + + QWindow window; + window.resize(100, 50); + window.show(); + window.requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(&window)); le.render(&img); QCOMPARE(img.pixel(10, le.height()/2), QColor(Qt::red).rgb()); } |