diff options
Diffstat (limited to 'tests/auto/qwidget_window/tst_qwidget_window.cpp')
| -rw-r--r-- | tests/auto/qwidget_window/tst_qwidget_window.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/qwidget_window/tst_qwidget_window.cpp b/tests/auto/qwidget_window/tst_qwidget_window.cpp index 5928419ebc..60ae6c3334 100644 --- a/tests/auto/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/qwidget_window/tst_qwidget_window.cpp @@ -80,7 +80,9 @@ private slots: void tst_windowFilePath_data(); void tst_windowFilePath(); +#ifdef Q_WS_X11 void tst_showWithoutActivating(); +#endif void tst_paintEventOnSecondShow(); }; @@ -285,11 +287,9 @@ void tst_QWidget_window::tst_windowFilePath() } } +#ifdef Q_WS_X11 void tst_QWidget_window::tst_showWithoutActivating() { -#ifndef Q_WS_X11 - QSKIP("This test is X11-only.", SkipAll); -#else QWidget w; w.show(); QTest::qWaitForWindowShown(&w); @@ -309,9 +309,8 @@ void tst_QWidget_window::tst_showWithoutActivating() (XGetInputFocus(QX11Info::display(), &window, &revertto), window) ); // Note the use of the , before window because we want the XGetInputFocus to be re-executed // in each iteration of the inside loop of the QTRY_COMPARE macro - -#endif // Q_WS_X11 } +#endif void tst_QWidget_window::tst_paintEventOnSecondShow() { |