diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-10 10:35:45 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-19 15:28:18 +0200 |
commit | 784a877d3cd9a1a75aca9c83146389503a966071 (patch) | |
tree | cb6822bf739cc63383ac3ed4bac2b6bb61e15a3a /src/plugins/platforms | |
parent | 208996751333933be601b4cccdd99c924d07436f (diff) |
Move QWindowSystemInterface out of qpa.
Public QtTest headers require it, so all unit tests would have to use private Qt
headers otherwise, which is not practical.
Change-Id: I5d4466ec30b6a57ebdfc34413e716e657eb51368
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
34 files changed, 34 insertions, 34 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm index b9e8e68960..895bcc5de5 100644 --- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm +++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm @@ -83,7 +83,7 @@ #include <qguiapplication.h> #include <private/qguiapplication_p.h> #include "qt_mac_p.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> QT_USE_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index eb3dea3789..971bc3ce95 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -47,7 +47,7 @@ #include "qnsview.h" #include <QtCore/private/qcore_mac_p.h> #include <qwindow.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <qpa/qplatformscreen.h> #include <Cocoa/Cocoa.h> diff --git a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h index c279c3f84f..8c05877ef5 100644 --- a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h +++ b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h @@ -57,7 +57,7 @@ #import <Cocoa/Cocoa.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <qhash.h> #include <QtCore> diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 4e54105faa..6c83e42fbc 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -51,7 +51,7 @@ #include "qcocoadrag.h" #include <qpa/qplatformintegration.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtGui/QTextFormat> #include <QtCore/QDebug> #include <private/qguiapplication_p.h> diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm index 28fab35980..af986bbb92 100644 --- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm +++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm @@ -42,7 +42,7 @@ #include "qnswindowdelegate.h" #include <QDebug> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> @implementation QNSWindowDelegate diff --git a/src/plugins/platforms/directfb/qdirectfbinput.cpp b/src/plugins/platforms/directfb/qdirectfbinput.cpp index a1776c27b6..4b4bbc5c96 100644 --- a/src/plugins/platforms/directfb/qdirectfbinput.cpp +++ b/src/plugins/platforms/directfb/qdirectfbinput.cpp @@ -44,7 +44,7 @@ #include <QThread> #include <QDebug> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QMouseEvent> #include <QEvent> diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.cpp b/src/plugins/platforms/directfb/qdirectfbwindow.cpp index 519f15de35..10763c4ab4 100644 --- a/src/plugins/platforms/directfb/qdirectfbwindow.cpp +++ b/src/plugins/platforms/directfb/qdirectfbwindow.cpp @@ -44,7 +44,7 @@ #include "qdirectfbinput.h" #include "qdirectfbscreen.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <directfb.h> diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp index e4d25db9bc..14d1cde0ea 100644 --- a/src/plugins/platforms/eglfs/qeglfscursor.cpp +++ b/src/plugins/platforms/eglfs/qeglfscursor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qeglfscursor.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtGui/QOpenGLContext> #include <QtCore/QJsonDocument> #include <QtCore/QJsonArray> diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp index b07fd19d1d..e09664a71b 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp @@ -41,7 +41,7 @@ #include "qeglfswindow.h" #include "qeglfshooks.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtPlatformSupport/private/qeglconvenience_p.h> diff --git a/src/plugins/platforms/kms/qkmswindow.cpp b/src/plugins/platforms/kms/qkmswindow.cpp index 691d9a832c..fcf6f554d8 100644 --- a/src/plugins/platforms/kms/qkmswindow.cpp +++ b/src/plugins/platforms/kms/qkmswindow.cpp @@ -42,7 +42,7 @@ #include "qkmswindow.h" #include "qkmsscreen.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE QKmsWindow::QKmsWindow(QWindow *window) diff --git a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp index ea82acd75b..e0fea72f75 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp @@ -41,7 +41,7 @@ #include "qminimaleglwindow.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdwindow.cpp b/src/plugins/platforms/openwfd/qopenwfdwindow.cpp index 904f249777..584f596c79 100644 --- a/src/plugins/platforms/openwfd/qopenwfdwindow.cpp +++ b/src/plugins/platforms/openwfd/qopenwfdwindow.cpp @@ -42,7 +42,7 @@ #include "qopenwfdwindow.h" #include "qopenwfdscreen.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> QOpenWFDWindow::QOpenWFDWindow(QWindow *window) : QPlatformWindow(window) diff --git a/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp b/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp index 25666c3189..630171a4ea 100644 --- a/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp +++ b/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp @@ -41,7 +41,7 @@ #include "qqnxeventdispatcher_blackberry.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <private/qguiapplication_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index ad2da5e3c9..391a17be27 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -81,7 +81,7 @@ #endif #include <qpa/qplatformwindow.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #if !defined(QT_NO_OPENGL) #include "qqnxglbackingstore.h" diff --git a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp index 88544a9964..15484ec2d8 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp +++ b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp @@ -43,7 +43,7 @@ #include <QDebug> #include <QGuiApplication> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #ifdef QQNXNAVIGATOREVENTHANDLER_DEBUG #define qNavigatorEventHandlerDebug qDebug diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp index ca82b5416b..62b38fcf5e 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.cpp +++ b/src/plugins/platforms/qnx/qqnxscreen.cpp @@ -44,7 +44,7 @@ #include <QtCore/QThread> #include <QtCore/QDebug> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <errno.h> diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.h b/src/plugins/platforms/qnx/qqnxscreeneventhandler.h index 9a1f441dee..04b222bd96 100644 --- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.h +++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.h @@ -42,7 +42,7 @@ #ifndef QQNXSCREENEVENTHANDLER_H #define QQNXSCREENEVENTHANDLER_H -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <screen/screen.h> diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index 95604a5e22..f717a33d78 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -47,7 +47,7 @@ #include "qqnxscreen.h" #include <QtGui/QWindow> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 7da9ae1494..37493fe3db 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -54,7 +54,7 @@ #include "qwindowstheme.h" #include <QtGui/QWindow> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <qpa/qplatformnativeinterface.h> #include <QtGui/QGuiApplication> diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp index 8ff67f53fb..e0cfd1bfd0 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp @@ -55,7 +55,7 @@ #include <QtGui/QPixmap> #include <QtGui/QPainter> #include <QtGui/QGuiApplication> -#include <qpa/qwindowsysteminterface_p.h> +#include <private/qwindowsysteminterface_p.h> #include <QtGui/private/qguiapplication_p.h> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp b/src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp index cd4c37622e..dc8c432f27 100644 --- a/src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp +++ b/src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp @@ -42,7 +42,7 @@ #include "qwindowsguieventdispatcher.h" #include "qwindowscontext.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtCore/QStack> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 55662e1fe2..1ff142bc98 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -68,7 +68,7 @@ #endif #include <qpa/qplatformnativeinterface.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtGui/QBackingStore> #include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/private/qguiapplication_p.h> diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index 044d31e972..76ce8b2e22 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp @@ -45,7 +45,7 @@ #include "qwindowsguieventdispatcher.h" #include <QtGui/QWindow> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtGui/QKeyEvent> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp index f1e3d70d96..4f60bbe292 100644 --- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp +++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp @@ -45,7 +45,7 @@ #include "qwindowswindow.h" #include "qwindowsintegration.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtGui/QGuiApplication> #include <QtGui/QScreen> diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index bb2dd579ee..e96c40b54b 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -50,7 +50,7 @@ #include <QtGui/QPixmap> #include <QtGui/QGuiApplication> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtGui/QScreen> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 5a459ebad6..6221aa07d8 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -57,7 +57,7 @@ #include <QtCore/QSysInfo> #include <QtGui/QPalette> #include <QtGui/QGuiApplication> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 85c8a6951a..96c2bc08e9 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -55,7 +55,7 @@ #include <QtGui/QWindow> #include <QtGui/QRegion> #include <private/qwindow_p.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 902ff831f9..f2dc2c669d 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -51,7 +51,7 @@ #include <QThread> #include <QVector> #include <QVarLengthArray> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #ifndef QT_NO_TABLETEVENT #include <QTabletEvent> diff --git a/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp b/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp index 4ad84aab46..9aba46c7a6 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp @@ -44,7 +44,7 @@ #ifdef XCB_USE_XINPUT2_MAEMO #include "qxcbwindow.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <X11/extensions/XInput2.h> #include <X11/extensions/XI2proto.h> #include <X11/Xatom.h> diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index 241748d50f..1721d7211e 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -43,7 +43,7 @@ #include "qxcbscreen.h" #include "qxcbwindow.h" #include "qtouchdevice.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> //#define XI2_TOUCH_DEBUG #ifdef XI2_TOUCH_DEBUG #include <QDebug> diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index 0aa473ce65..b9d7852696 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -54,7 +54,7 @@ #include <qrect.h> #include <qpainter.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtPlatformSupport/private/qshapedpixmapdndwindow_p.h> #include <QtPlatformSupport/private/qsimpledrag_p.h> diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp index 5ad23a858b..2652e88755 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -44,7 +44,7 @@ #include "qxcbscreen.h" #include <xcb/xcb_keysyms.h> #include <X11/keysym.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtCore/QTextCodec> #include <QtCore/QMetaMethod> #include <private/qguiapplication_p.h> diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 0b362c5256..0983759fad 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -50,7 +50,7 @@ #include <xcb/randr.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index bb4225b221..e51bab495d 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -91,7 +91,7 @@ #include <private/qwindow_p.h> #include <qpa/qplatformbackingstore.h> -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <stdio.h> |