diff options
Diffstat (limited to 'src')
46 files changed, 49 insertions, 49 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index a27a8558cd..0ec888f625 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 <QWindowSystemInterface> -#include "private/qwindowsysteminterface_qpa_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/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 3c2246cf00..8de647c160 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -41,7 +41,7 @@ #include "qplatformwindow.h" -#include <QtGui/qwindowsysteminterface_qpa.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 985b62e0a5..77e467776c 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 <QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QtCore/QElapsedTimer> #include <QtCore/QAtomicInt> #include <QtCore/QSemaphore> diff --git a/src/platformsupport/fb_base/fb_base.cpp b/src/platformsupport/fb_base/fb_base.cpp index 516274962d..a79681163b 100644 --- a/src/platformsupport/fb_base/fb_base.cpp +++ b/src/platformsupport/fb_base/fb_base.cpp @@ -44,7 +44,7 @@ #include <qdebug.h> #include <qbitmap.h> #include <qpa/qplatformcursor.h> -#include <QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> QPlatformSoftwareCursor::QPlatformSoftwareCursor(QPlatformScreen *scr) : QPlatformCursor(scr), currentRect(QRect()), prevRect(QRect()) diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index 9d596780a9..6d27cef318 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -45,7 +45,7 @@ #include <QSocketNotifier> #include <QStringList> -#include <QWindowSystemInterface> +#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 fde378ce02..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 <QWindowSystemInterface> +#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 7d4a35b8bb..1fd23d7cf9 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 <QWindowSystemInterface> +#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 749cfcd8cc..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 <QWindowSystemInterface> +#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 f9f84128e3..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 <QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_HEADER diff --git a/src/plugins/generic/meego/qmeegointegration.cpp b/src/plugins/generic/meego/qmeegointegration.cpp index 616d5e82ab..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 <qwindowsysteminterface_qpa.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 369b602c1a..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 <QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <Qt> diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm index 09dec60622..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> +#include <qpa/qwindowsysteminterface.h> QT_USE_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 1a8e08e77d..95f35dd9c1 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 <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 11770021db..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> +#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 c94b8a5df3..718af1e73a 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -50,7 +50,7 @@ #include "qmultitouch_mac_p.h" #include "qcocoadrag.h" -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QtGui/QTextFormat> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm index 2548fb4a9d..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 <QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> @implementation QNSWindowDelegate diff --git a/src/plugins/platforms/directfb/qdirectfbinput.cpp b/src/plugins/platforms/directfb/qdirectfbinput.cpp index 662493ff20..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 <QWindowSystemInterface> +#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 4283cb9167..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> +#include <qpa/qwindowsysteminterface.h> #include <directfb.h> diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp index a0bfa80887..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_qpa.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 36089b5ce0..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> +#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 ebf327c330..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> +#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 0279cfb413..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> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdwindow.cpp b/src/plugins/platforms/openwfd/qopenwfdwindow.cpp index 5189966766..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" +#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 c7d9eb5ed9..25666c3189 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 <QWindowSystemInterface> +#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 a63c217136..538f8fa59c 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> +#include <qpa/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 c42e07c41d..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 <QWindowSystemInterface> +#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 a3360b1fe3..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> +#include <qpa/qwindowsysteminterface.h> #include <errno.h> diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.h b/src/plugins/platforms/qnx/qqnxscreeneventhandler.h index 06cc7a0b32..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 <QWindowSystemInterface> +#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 d951e7cfa1..95050aa05c 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> +#include <qpa/qwindowsysteminterface.h> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index ba32369c03..92c92676bb 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> +#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 e86fa1e73d..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 <QtGui/private/qwindowsysteminterface_qpa_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 64877d71ea..cd4c37622e 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> +#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 7d4308d578..fea7fec1af 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> +#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 d3a3468037..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> +#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 e9a2b5c19d..a0b27c1f4a 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> +#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 90a5261a91..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> +#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 0feb62dcea..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> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index b553c15864..2e2ea5f854 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> +#include <qpa/qwindowsysteminterface.h> #include <QtCore/QDebug> diff --git a/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp b/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp index 463e119ebd..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> +#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 026fd8c5af..f9aaec84cb 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -41,7 +41,7 @@ #include "qxcbconnection.h" #include "qxcbwindow.h" -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #ifdef XCB_USE_XINPUT2 diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index 176d1bbe2e..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> +#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 9876adfdfc..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> +#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 fbfaa894eb..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> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 249c6cf0ef..bb4225b221 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 <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <stdio.h> diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index bc9060a7d5..e4670ca5bf 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 <QWindowSystemInterface> -#include "private/qwindowsysteminterface_qpa_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 869cb7c255..139c72f629 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -58,8 +58,8 @@ #include <qpa/qplatformtheme.h> #include <qdebug.h> -#include <QWindowSystemInterface> -#include "private/qwindowsysteminterface_qpa_p.h" +#include <qpa/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface_p.h> #include <qpa/qplatformintegration.h> #include "qdesktopwidget_qpa_p.h" |