diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-16 13:47:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 16:30:55 +0200 |
| commit | 7a2aafcbbf05866b531bb2c3da4aa739df9e190b (patch) | |
| tree | 3808a243a32b1452cce7250b310f3c9d0a49ae33 /tests | |
| parent | 199741d0260f5cbdb05e64fe73cfca1820da93d1 (diff) | |
Remove #ifdef Q_WS_ / include / #endif conditionals.
Change-Id: I734490ddcb5501e620370e50ef06180ab5e23393
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tests')
6 files changed, 0 insertions, 22 deletions
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: |