From c5db8fc74a9d437a4e7c0af077aed7c1f1bd4e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Mon, 2 Feb 2015 18:49:18 +0100
Subject: 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>
---
 .../gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp      | 2 +-
 .../gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp     | 6 +++---
 .../gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/benchmarks')

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
index df9d38e4fc..aad143ff68 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
@@ -35,7 +35,7 @@
 
 #include <QtGui>
 
-#ifdef Q_WS_WIN
+#ifdef Q_DEAD_CODE_FROM_QT4_WIN
 #define CALLGRIND_START_INSTRUMENTATION  {}
 #define CALLGRIND_STOP_INSTRUMENTATION   {}
 #else
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
index 1cddad4b91..579d32645e 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
@@ -32,14 +32,14 @@
 ****************************************************************************/
 #include <QtGui>
 
-#ifdef Q_WS_WIN
+#ifdef Q_DEAD_CODE_FROM_QT4_WIN
 #define CALLGRIND_START_INSTRUMENTATION  {}
 #define CALLGRIND_STOP_INSTRUMENTATION   {}
 #else
 #include "valgrind/callgrind.h"
 #endif
 
-#ifdef Q_WS_X11
+#ifdef Q_DEAD_CODE_FROM_QT4_X11
 extern void qt_x11_wait_for_window_manager(QWidget *);
 #endif
 
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
     View view(&scene, item);
     view.resize(300, 300);
     view.show();
-#ifdef Q_WS_X11
+#ifdef Q_DEAD_CODE_FROM_QT4_X11
     qt_x11_wait_for_window_manager(&view);
 #endif
 
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
index 8bfe009b4e..c0dad860e4 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
@@ -32,7 +32,7 @@
 ****************************************************************************/
 #include <QtGui>
 
-#ifdef Q_WS_WIN
+#ifdef Q_DEAD_CODE_FROM_QT4_WIN
 #define CALLGRIND_START_INSTRUMENTATION  {}
 #define CALLGRIND_STOP_INSTRUMENTATION   {}
 #else
-- 
cgit v1.2.3