AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove #ifdef Q_WS_ / include / #endif conditionals.

Browse Source 
Change-Id: I734490ddcb5501e620370e50ef06180ab5e23393
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-07-16 13:47:04 +02:00 committed by Qt by Nokia
parent 199741d026
commit 7a2aafcbbf
10 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/graphicsview/qgraphicsitem.cpp
View File

@ -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>

3
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -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>

4
src/widgets/graphicsview/qgraphicsview.cpp
View File

@ -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>

3
src/widgets/util/qscroller.cpp
View File

@ -65,9 +65,6 @@
#include <QtDebug>
#if defined(Q_WS_X11)
# include "private/qt_x11_p.h"
#endif
QT_BEGIN_NAMESPACE

3
tests/auto/platformquirks.h
View File

@ -48,9 +48,6 @@
#include <qapplication.h>
#endif
#ifdef Q_WS_X11
#include <private/qt_x11_p.h>
#endif
struct PlatformQuirks
{

3
tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
View File

@ -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)
{

4
tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
View File

@ -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
{

2
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
View File

@ -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>

4
tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
View File

@ -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>

6
tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
View File

@ -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: