diff options
55 files changed, 62 insertions, 59 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index be773b410d..a4d07603ef 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -74,8 +74,8 @@ #include <qpa/qplatforminputcontext.h> #include <qpa/qplatforminputcontext_p.h> -#include <QtGui/qwindowsysteminterface.h> -#include <private/qwindowsysteminterface_p.h> +#include <qpa/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface_p.h> #include "private/qwindow_p.h" #include "private/qcursor_p.h" diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index b3cafc5d2c..58a82a9cc5 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -49,8 +49,8 @@ #include <QtCore/private/qthread_p.h> -#include <QWindowSystemInterface> -#include "private/qwindowsysteminterface_p.h" +#include <qpa/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface_p.h> #include "private/qshortcutmap_p.h" #include <qicon.h> diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index c579a6ec57..d79884a1db 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -42,7 +42,7 @@ #include "qplatformwindow.h" #include "qplatformwindow_p.h" -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <QtGui/qwindow.h> #include <QtGui/qscreen.h> diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp index 4b22dff749..ab65925486 100644 --- a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp @@ -44,7 +44,7 @@ #include "qunixeventdispatcher_qpa_p.h" #include "private/qguiapplication_p.h" -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <QtCore/QElapsedTimer> #include <QtCore/QAtomicInt> #include <QtCore/QSemaphore> diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index 54a4f0c1b6..c7f439394e 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -45,7 +45,7 @@ #include <QSocketNotifier> #include <QStringList> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <QCoreApplication> #include <private/qcore_unix_p.h> diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp index 554384dfe9..f23bea7a62 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp @@ -46,7 +46,7 @@ #include <QPoint> #include <QGuiApplication> #include <QScreen> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <qplatformdefs.h> #include <private/qcore_unix_p.h> // overrides QT_OPEN diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp index 94253fa1ac..677e06ba88 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp @@ -44,7 +44,7 @@ #include <QStringList> #include <QGuiApplication> #include <QScreen> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> //#define QT_QPA_MOUSEMANAGER_DEBUG diff --git a/src/platformsupport/input/evdevtablet/qevdevtablet.cpp b/src/platformsupport/input/evdevtablet/qevdevtablet.cpp index d500c41b83..9b654a6119 100644 --- a/src/platformsupport/input/evdevtablet/qevdevtablet.cpp +++ b/src/platformsupport/input/evdevtablet/qevdevtablet.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qevdevtablet_p.h" -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <QStringList> #include <QSocketNotifier> #include <QGuiApplication> diff --git a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h index 0f00b425b7..a7d8e583db 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h +++ b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h @@ -46,7 +46,7 @@ #include <QString> #include <QList> #include <QThread> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_HEADER diff --git a/src/plugins/generic/meego/qmeegointegration.cpp b/src/plugins/generic/meego/qmeegointegration.cpp index 68766b2492..59f3e5ef06 100644 --- a/src/plugins/generic/meego/qmeegointegration.cpp +++ b/src/plugins/generic/meego/qmeegointegration.cpp @@ -45,7 +45,7 @@ #include <QDBusConnection> #include <QDBusArgument> #include <qguiapplication.h> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> QMeeGoIntegration::QMeeGoIntegration() : screenTopEdge(QStringLiteral("com.nokia.SensorService"), QStringLiteral("Screen.TopEdge")) diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp index 1f392dc298..de95cf25a9 100644 --- a/src/plugins/generic/tslib/qtslib.cpp +++ b/src/plugins/generic/tslib/qtslib.cpp @@ -46,7 +46,7 @@ #include <QSocketNotifier> #include <QStringList> #include <QPoint> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <Qt> diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm index 895bcc5de5..b9e8e68960 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> QT_USE_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 96a27c2641..15b35d6585 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 <QtGui/QWindowSystemInterface> +#include <qpa/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 8c05877ef5..c279c3f84f 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <qhash.h> #include <QtCore> diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index aeecefab4a..3f43c1dfa2 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 af986bbb92..28fab35980 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> @implementation QNSWindowDelegate diff --git a/src/plugins/platforms/directfb/qdirectfbinput.cpp b/src/plugins/platforms/directfb/qdirectfbinput.cpp index 4b4bbc5c96..a1776c27b6 100644 --- a/src/plugins/platforms/directfb/qdirectfbinput.cpp +++ b/src/plugins/platforms/directfb/qdirectfbinput.cpp @@ -44,7 +44,7 @@ #include <QThread> #include <QDebug> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <QMouseEvent> #include <QEvent> diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.cpp b/src/plugins/platforms/directfb/qdirectfbwindow.cpp index 10763c4ab4..519f15de35 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <directfb.h> diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp index 14d1cde0ea..e4d25db9bc 100644 --- a/src/plugins/platforms/eglfs/qeglfscursor.cpp +++ b/src/plugins/platforms/eglfs/qeglfscursor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qeglfscursor.h" -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/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 e09664a71b..b07fd19d1d 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 fcf6f554d8..691d9a832c 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 e0fea72f75..ea82acd75b 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp @@ -41,7 +41,7 @@ #include "qminimaleglwindow.h" -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdwindow.cpp b/src/plugins/platforms/openwfd/qopenwfdwindow.cpp index 584f596c79..904f249777 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 39f23c0d6e..b2133e1f66 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 6d0c2000f8..8789a608ff 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #if !defined(QT_NO_OPENGL) #include "qqnxglcontext.h" diff --git a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp index 15484ec2d8..88544a9964 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp +++ b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp @@ -43,7 +43,7 @@ #include <QDebug> #include <QGuiApplication> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/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 62b38fcf5e..ca82b5416b 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <errno.h> diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.h b/src/plugins/platforms/qnx/qqnxscreeneventhandler.h index 04b222bd96..9a1f441dee 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <screen/screen.h> diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index dd69d15002..68a576cc37 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index b2c492af39..2d2298fdf0 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 e0cfd1bfd0..8ff67f53fb 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 <private/qwindowsysteminterface_p.h> +#include <qpa/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 2ebb3cefbd..4acf423c6d 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 f32f8cd689..fb8d40c2b1 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 76ce8b2e22..044d31e972 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 4f60bbe292..f1e3d70d96 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 e96c40b54b..bb2dd579ee 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 6221aa07d8..5a459ebad6 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 62f8017185..9c40336069 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index f2dc2c669d..902ff831f9 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 9aba46c7a6..4ad84aab46 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 1721d7211e..241748d50f 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 b9d7852696..0aa473ce65 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 2652e88755..5ad23a858b 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 <QtGui/qwindowsysteminterface.h> +#include <qpa/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 0983759fad..0b362c5256 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -50,7 +50,7 @@ #include <xcb/randr.h> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index d07442e4ef..370db82a07 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -94,7 +94,7 @@ #include <private/qwindow_p.h> #include <qpa/qplatformbackingstore.h> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <stdio.h> diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index e53896f82c..a779c294cb 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -70,8 +70,8 @@ #include "private/qcoreapplication_p.h" #include "QtCore/qpoint.h" #include <QTime> -#include <QtGui/qwindowsysteminterface.h> -#include <private/qwindowsysteminterface_p.h> +#include <qpa/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface_p.h> #include <qpa/qplatformintegration.h> #include "private/qguiapplication_p.h" diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index fb7a34baca..0afc208571 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -57,8 +57,8 @@ #include <qpa/qplatformtheme.h> #include <qdebug.h> -#include <QtGui/qwindowsysteminterface.h> -#include <private/qwindowsysteminterface_p.h> +#include <qpa/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface_p.h> #include <qpa/qplatformintegration.h> #include "qdesktopwidget_qpa_p.h" diff --git a/sync.profile b/sync.profile index 623dfd8a26..d63cdc0934 100644 --- a/sync.profile +++ b/sync.profile @@ -89,6 +89,9 @@ "QPlatformThemePlugin" => "qpa/qplatformthemeplugin.h", "qplatformwindow_qpa.h" => "qpa/qplatformwindow.h", "QPlatformWindow" => "qpa/qplatformwindow.h", + "qwindowsysteminterface_qpa.h" => "qpa/qwindowsysteminterface.h", + "QWindowSystemInterface" => "qpa/qwindowsysteminterface.h", + "qwindowsysteminterface_qpa_p.h" => "qpa/qwindowsysteminterface_p.h", "qgenericpluginfactory_qpa.h" => "QtGui/qgenericpluginfactory.h", "qgenericplugin_qpa.h" => "QtGui/qgenericplugin.h", "QGenericPlugin" => "QtGui/QGenericPlugin", @@ -121,7 +124,7 @@ } ); -@qpa_headers = ( qr/^qplatform/ ); +@qpa_headers = ( qr/^qplatform/, qr/^qwindowsystem/ ); @ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h" ); @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index f7f0f8d28c..5e063fb266 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> #include <QtGui/QGuiApplication> #include <QtGui/QWindow> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QDebug> diff --git a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp index 8a0246c71e..278fe67cbf 100644 --- a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp +++ b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qscreen.h> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QtTest/QtTest> diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index 694a76f355..485a9724a5 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -42,7 +42,7 @@ #include <QtGui> #include <QtWidgets> #include <QtTest> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> static QWindowSystemInterface::TouchPoint touchPoint(const QTouchEvent::TouchPoint& pt) { diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 0346284e61..0f9cf2b5d8 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qwindow.h> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QtTest/QtTest> diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp index fb27df5555..4b44d1aa32 100644 --- a/tests/auto/other/gestures/tst_gestures.cpp +++ b/tests/auto/other/gestures/tst_gestures.cpp @@ -52,7 +52,7 @@ #include <qgraphicswidget.h> #include <qgraphicsview.h> #include <qmainwindow.h> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <qdebug.h> diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index f98946d794..fc91ba23b3 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -69,7 +69,7 @@ #include <windows.h> #endif -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp index 67117eb51a..969ec89596 100644 --- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp +++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp @@ -42,7 +42,7 @@ #include <QtGui> #include <QtWidgets> #include <QtTest> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> // #include <QDebug> |