diff options
Diffstat (limited to 'tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index eb8b555bd6..f25a383177 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -77,9 +77,7 @@ private slots: void tst_windowFilePath_data(); void tst_windowFilePath(); -#ifdef Q_WS_X11 void tst_showWithoutActivating(); -#endif void tst_paintEventOnSecondShow(); }; @@ -284,9 +282,11 @@ 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."); +#else QWidget w; w.show(); QTest::qWaitForWindowShown(&w); @@ -306,8 +306,9 @@ 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() { |