From 7a2aafcbbf05866b531bb2c3da4aa739df9e190b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 16 Jul 2012 13:47:04 +0200
Subject: [PATCH] Remove #ifdef Q_WS_ / include / #endif conditionals.

Change-Id: I734490ddcb5501e620370e50ef06180ab5e23393
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 src/widgets/graphicsview/qgraphicsitem.cpp                  | 6 ------
 src/widgets/graphicsview/qgraphicsscene.cpp                 | 3 ---
 src/widgets/graphicsview/qgraphicsview.cpp                  | 4 ----
 src/widgets/util/qscroller.cpp                              | 3 ---
 tests/auto/platformquirks.h                                 | 3 ---
 .../qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp       | 3 ---
 .../widgets/kernel/qwidget_window/tst_qwidget_window.cpp    | 4 ----
 tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp      | 2 --
 tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp        | 4 ----
 tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp    | 6 ------
 10 files changed, 38 deletions(-)

diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 5e1efd2256..99d9ebd82b 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -756,12 +756,6 @@
 #include <private/qtextengine_p.h>
 #include <private/qwidget_p.h>
 #include <private/qapplication_p.h>
-
-#ifdef Q_WS_X11
-#include <private/qt_x11_p.h>
-#include <private/qpixmap_x11_p.h>
-#endif
-
 #include <private/qgesturemanager_p.h>
 
 #include <math.h>
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index c617e63503..6fe619ec02 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -250,9 +250,6 @@
 #endif
 #include <private/qapplication_p.h>
 #include <private/qobject_p.h>
-#ifdef Q_WS_X11
-#include <private/qt_x11_p.h>
-#endif
 #include <private/qgraphicseffect_p.h>
 #include <private/qgesturemanager_p.h>
 #include <private/qpathclipper_p.h>
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index 17212ba08d..633e92744b 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -281,10 +281,6 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime <
 #include <QtGui/qpainter.h>
 #include <QtWidgets/qscrollbar.h>
 #include <QtWidgets/qstyleoption.h>
-#ifdef Q_WS_X11
-#include <QtGui/qpaintengine.h>
-#include <private/qt_x11_p.h>
-#endif
 
 #include <private/qevent_p.h>
 
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp
index 2c8b617761..f9c12ae5a6 100644
--- a/src/widgets/util/qscroller.cpp
+++ b/src/widgets/util/qscroller.cpp
@@ -65,9 +65,6 @@
 
 #include <QtDebug>
 
-#if defined(Q_WS_X11)
-#  include "private/qt_x11_p.h"
-#endif
 
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/platformquirks.h b/tests/auto/platformquirks.h
index 136e084270..c75c5ed19e 100644
--- a/tests/auto/platformquirks.h
+++ b/tests/auto/platformquirks.h
@@ -48,9 +48,6 @@
 #include <qapplication.h>
 #endif
 
-#ifdef Q_WS_X11
-#include <private/qt_x11_p.h>
-#endif
 
 struct PlatformQuirks
 {
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index cdcd91091e..d17a5a7b1f 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -48,9 +48,6 @@
 #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
 #include <QMacStyle>
 #endif
-#ifdef Q_WS_X11
-#include <private/qt_x11_p.h>
-#endif
 
 static void sendMouseMove(QWidget *widget, const QPoint &point, Qt::MouseButton button = Qt::NoButton)
 {
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 edb7133fe7..5fba3f2391 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -47,10 +47,6 @@
 
 #include <qlistwidget.h>
 
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#include <QX11Info>
-#endif // Q_WS_X11
 
 class tst_QWidget_window : public QWidget
 {
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 18a8666f26..ce0049cc2d 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -62,8 +62,6 @@
 #include <qboxlayout.h>
 #ifdef Q_OS_MAC
 #include <qmacstyle_mac.h>
-#elif defined Q_WS_X11
-#include <private/qt_x11_p.h>
 #endif
 
 #include <qstandarditemmodel.h>
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index 07efb60b49..5105ed67ba 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -45,10 +45,6 @@
 #include <qapplication.h>
 #include <limits.h>
 
-#ifdef Q_WS_X11
-#include <unistd.h>
-#endif
-
 #include <qspinbox.h>
 #include <qlocale.h>
 #include <qlineedit.h>
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index ed644ea033..01bea30a7d 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -55,12 +55,6 @@
 #else
 #define Q_CHECK_PAINTEVENTS
 #endif
-#if defined(Q_WS_X11)
-#  include <private/qt_x11_p.h>
-#  include <qx11info_x11.h>
-#elif defined(Q_WS_QWS)
-# include <qwindowsystem_qws.h>
-#endif
 
 class QTabWidgetChild:public QTabWidget {
   public: