diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2015-02-02 18:49:18 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-02-03 11:49:14 +0000 |
| commit | c5db8fc74a9d437a4e7c0af077aed7c1f1bd4e26 (patch) | |
| tree | f7d42e0be35dd0ed85e74eaecdbbad4f319bc1d1 /tests/auto/widgets/kernel/qwidget_window | |
| parent | 611bcc3cd337fe77ea5d3b898d897582da6f7ee2 (diff) | |
Make it more obvious that Q_WS_ is dead code, and should perhaps be ported
We still have a bunch of Q_WS_ ifdefs in our code, which are easy to
mistake for Q_OS_ ifdefs when quickly scanning the code. By renaming
the ifdefs we make it clear that the code in question is dead.
In incremental follow-ups, we can then selectively either remove, or
port, the pieces that are dead code.
Change-Id: Ib5ef3e9e0662d321f179f3e25122cacafff0f41f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'tests/auto/widgets/kernel/qwidget_window')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp | 4 |
1 files changed, 2 insertions, 2 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 36791293ab..6a06884989 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -336,7 +336,7 @@ void tst_QWidget_window::tst_windowFilePath() void tst_QWidget_window::tst_showWithoutActivating() { -#ifndef Q_WS_X11 +#ifndef Q_DEAD_CODE_FROM_QT4_X11 QSKIP("This test is X11-only."); #else QWidget w; @@ -359,7 +359,7 @@ void tst_QWidget_window::tst_showWithoutActivating() // 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 // Q_DEAD_CODE_FROM_QT4_X11 } void tst_QWidget_window::tst_paintEventOnSecondShow() |