path: root/tests/manual
diff options
authorTor Arne Vestbø <>2015-02-02 18:49:18 +0100
committerTor Arne Vestbø <>2015-02-03 11:49:14 +0000
commitc5db8fc74a9d437a4e7c0af077aed7c1f1bd4e26 (patch)
treef7d42e0be35dd0ed85e74eaecdbbad4f319bc1d1 /tests/manual
parent611bcc3cd337fe77ea5d3b898d897582da6f7ee2 (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 <>
Diffstat (limited to 'tests/manual')
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h
index 40cfe09111..3666917402 100644
--- a/tests/manual/bearerex/bearerex.h
+++ b/tests/manual/bearerex/bearerex.h
@@ -38,7 +38,7 @@
#include "ui_detailedinfodialog.h"
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_DEAD_CODE_FROM_QT4_MAEMO_6)
#include "ui_bearerex_maemo.h"
#include "ui_sessiondialog_maemo.h"
diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp
index 3ad9417da5..8668df330f 100644
--- a/tests/manual/lance/main.cpp
+++ b/tests/manual/lance/main.cpp
@@ -332,7 +332,7 @@ int main(int argc, char **argv)
checkers_background = false;
} else {
-#if defined (Q_WS_WIN)
+#if defined (Q_DEAD_CODE_FROM_QT4_WIN)
QString input = QString::fromLocal8Bit(argv[i]);
if (input.indexOf('*') >= 0) {
QFileInfo info(input);
diff --git a/tests/manual/textrendering/glyphshaping/main.cpp b/tests/manual/textrendering/glyphshaping/main.cpp
index 3b47061396..0d785b8f2b 100644
--- a/tests/manual/textrendering/glyphshaping/main.cpp
+++ b/tests/manual/textrendering/glyphshaping/main.cpp
@@ -165,7 +165,7 @@ bool dumpHtml(const QString &pathName)
QString platformName = QString::fromLatin1(
#if defined(Q_OS_WIN)
-#elif defined(Q_WS_X11)
+#elif defined(Q_DEAD_CODE_FROM_QT4_X11)