From 3d0af143ca51af0a3cbd81a794e6726992f9a86b Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 26 Jul 2012 13:23:28 +0200 Subject: [PATCH] Revert "Move QWindowSystemInterface out of qpa." This reverts commit 784a877d3cd9a1a75aca9c83146389503a966071. Conflicts: src/plugins/platforms/cocoa/qcocoawindow.mm src/testlib/qtestkeyboard.h src/testlib/qtestmouse.h src/testlib/qtesttouch.h Change-Id: Iebfed179b3eb7f30e4c95edcae5a8ad6fd50330e Reviewed-by: Lars Knoll --- src/gui/kernel/qguiapplication.cpp | 4 ++-- src/gui/kernel/qguiapplication_p.h | 4 ++-- src/gui/kernel/qplatformwindow.cpp | 2 +- .../eventdispatchers/qunixeventdispatcher.cpp | 2 +- .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 2 +- src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp | 2 +- src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp | 2 +- src/platformsupport/input/evdevtablet/qevdevtablet.cpp | 2 +- src/platformsupport/input/evdevtouch/qevdevtouch_p.h | 2 +- src/plugins/generic/meego/qmeegointegration.cpp | 2 +- src/plugins/generic/tslib/qtslib.cpp | 2 +- src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm | 2 +- src/plugins/platforms/cocoa/qcocoawindow.mm | 2 +- src/plugins/platforms/cocoa/qmultitouch_mac_p.h | 2 +- src/plugins/platforms/cocoa/qnsview.mm | 2 +- src/plugins/platforms/cocoa/qnswindowdelegate.mm | 2 +- src/plugins/platforms/directfb/qdirectfbinput.cpp | 2 +- src/plugins/platforms/directfb/qdirectfbwindow.cpp | 2 +- src/plugins/platforms/eglfs/qeglfscursor.cpp | 2 +- src/plugins/platforms/eglfs/qeglfswindow.cpp | 2 +- src/plugins/platforms/kms/qkmswindow.cpp | 2 +- src/plugins/platforms/minimalegl/qminimaleglwindow.cpp | 2 +- src/plugins/platforms/openwfd/qopenwfdwindow.cpp | 2 +- src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp | 2 +- src/plugins/platforms/qnx/qqnxintegration.cpp | 2 +- src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp | 2 +- src/plugins/platforms/qnx/qqnxscreen.cpp | 2 +- src/plugins/platforms/qnx/qqnxscreeneventhandler.h | 2 +- src/plugins/platforms/qnx/qqnxwindow.cpp | 2 +- src/plugins/platforms/windows/qwindowscontext.cpp | 2 +- src/plugins/platforms/windows/qwindowsdrag.cpp | 2 +- src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp | 2 +- src/plugins/platforms/windows/qwindowsintegration.cpp | 2 +- src/plugins/platforms/windows/qwindowskeymapper.cpp | 2 +- src/plugins/platforms/windows/qwindowsmousehandler.cpp | 2 +- src/plugins/platforms/windows/qwindowsscreen.cpp | 2 +- src/plugins/platforms/windows/qwindowstheme.cpp | 2 +- src/plugins/platforms/windows/qwindowswindow.cpp | 2 +- src/plugins/platforms/xcb/qxcbconnection.h | 2 +- src/plugins/platforms/xcb/qxcbconnection_maemo.cpp | 2 +- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 2 +- src/plugins/platforms/xcb/qxcbdrag.cpp | 2 +- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 2 +- src/plugins/platforms/xcb/qxcbscreen.cpp | 2 +- src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- src/widgets/kernel/qapplication_p.h | 4 ++-- src/widgets/kernel/qapplication_qpa.cpp | 4 ++-- sync.profile | 5 ++++- .../auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 2 +- tests/auto/gui/kernel/qscreen/tst_qscreen.cpp | 2 +- tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | 2 +- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 2 +- tests/auto/other/gestures/tst_gestures.cpp | 2 +- tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 2 +- tests/auto/widgets/util/qscroller/tst_qscroller.cpp | 2 +- 55 files changed, 62 insertions(+), 59 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index be773b410d9..a4d07603efd 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -74,8 +74,8 @@ #include #include -#include -#include +#include +#include #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 b3cafc5d2c2..58a82a9cc5e 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -49,8 +49,8 @@ #include -#include -#include "private/qwindowsysteminterface_p.h" +#include +#include #include "private/qshortcutmap_p.h" #include diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index c579a6ec57e..d79884a1db7 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 +#include #include #include diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp index 4b22dff7497..ab659254862 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 +#include #include #include #include diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index 54a4f0c1b6a..c7f439394e6 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp index 554384dfe9a..f23bea7a629 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include // overrides QT_OPEN diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp index 94253fa1ac8..677e06ba88d 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include //#define QT_QPA_MOUSEMANAGER_DEBUG diff --git a/src/platformsupport/input/evdevtablet/qevdevtablet.cpp b/src/platformsupport/input/evdevtablet/qevdevtablet.cpp index d500c41b83b..9b654a61193 100644 --- a/src/platformsupport/input/evdevtablet/qevdevtablet.cpp +++ b/src/platformsupport/input/evdevtablet/qevdevtablet.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qevdevtablet_p.h" -#include +#include #include #include #include diff --git a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h index 0f00b425b7b..a7d8e583db0 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h +++ b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/generic/meego/qmeegointegration.cpp b/src/plugins/generic/meego/qmeegointegration.cpp index 68766b2492a..59f3e5ef06a 100644 --- a/src/plugins/generic/meego/qmeegointegration.cpp +++ b/src/plugins/generic/meego/qmeegointegration.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include 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 1f392dc298c..de95cf25a94 100644 --- a/src/plugins/generic/tslib/qtslib.cpp +++ b/src/plugins/generic/tslib/qtslib.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm index 895bcc5de5b..b9e8e689605 100644 --- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm +++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm @@ -83,7 +83,7 @@ #include #include #include "qt_mac_p.h" -#include +#include QT_USE_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 96a27c26414..15b35d6585e 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -47,7 +47,7 @@ #include "qnsview.h" #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h index 8c05877ef50..c279c3f84fc 100644 --- a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h +++ b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h @@ -57,7 +57,7 @@ #import -#include +#include #include #include diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index aeecefab4af..3f43c1dfa27 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -51,7 +51,7 @@ #include "qcocoadrag.h" #include -#include +#include #include #include #include diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm index af986bbb926..28fab35980c 100644 --- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm +++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm @@ -42,7 +42,7 @@ #include "qnswindowdelegate.h" #include -#include +#include @implementation QNSWindowDelegate diff --git a/src/plugins/platforms/directfb/qdirectfbinput.cpp b/src/plugins/platforms/directfb/qdirectfbinput.cpp index 4b4bbc5c964..a1776c27b64 100644 --- a/src/plugins/platforms/directfb/qdirectfbinput.cpp +++ b/src/plugins/platforms/directfb/qdirectfbinput.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.cpp b/src/plugins/platforms/directfb/qdirectfbwindow.cpp index 10763c4ab41..519f15de357 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 +#include #include diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp index 14d1cde0eaa..e4d25db9bcb 100644 --- a/src/plugins/platforms/eglfs/qeglfscursor.cpp +++ b/src/plugins/platforms/eglfs/qeglfscursor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qeglfscursor.h" -#include +#include #include #include #include diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp index e09664a71b1..b07fd19d1d3 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 +#include #include diff --git a/src/plugins/platforms/kms/qkmswindow.cpp b/src/plugins/platforms/kms/qkmswindow.cpp index fcf6f554d8c..691d9a832c1 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 +#include QT_BEGIN_NAMESPACE QKmsWindow::QKmsWindow(QWindow *window) diff --git a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp index e0fea72f75e..ea82acd75b9 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp @@ -41,7 +41,7 @@ #include "qminimaleglwindow.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdwindow.cpp b/src/plugins/platforms/openwfd/qopenwfdwindow.cpp index 584f596c798..904f2497779 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 +#include 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 39f23c0d6e1..b2133e1f662 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 +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index 6d0c2000f8b..8789a608fff 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -81,7 +81,7 @@ #endif #include -#include +#include #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 15484ec2d86..88544a99640 100644 --- a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp +++ b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #ifdef QQNXNAVIGATOREVENTHANDLER_DEBUG #define qNavigatorEventHandlerDebug qDebug diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp index 62b38fcf5e8..ca82b5416b5 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.cpp +++ b/src/plugins/platforms/qnx/qqnxscreen.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.h b/src/plugins/platforms/qnx/qqnxscreeneventhandler.h index 04b222bd96e..9a1f441deed 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 +#include #include diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index dd69d150029..68a576cc379 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -47,7 +47,7 @@ #include "qqnxscreen.h" #include -#include +#include #include diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index b2c492af39c..2d2298fdf02 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -54,7 +54,7 @@ #include "qwindowstheme.h" #include -#include +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp index e0cfd1bfd09..8ff67f53fb3 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp b/src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp index 2ebb3cefbda..4acf423c6d7 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 +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index f32f8cd6890..fb8d40c2b1c 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -68,7 +68,7 @@ #endif #include -#include +#include #include #include #include diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index 76ce8b2e220..044d31e972b 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp @@ -45,7 +45,7 @@ #include "qwindowsguieventdispatcher.h" #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp index 4f60bbe2921..f1e3d70d969 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 +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index e96c40b54b3..bb2dd579eea 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 6221aa07d8f..5a459ebad62 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -57,7 +57,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 62f80171850..9c403360698 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index f2dc2c669d6..902ff831f99 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -51,7 +51,7 @@ #include #include #include -#include +#include #ifndef QT_NO_TABLETEVENT #include diff --git a/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp b/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp index 9aba46c7a6f..4ad84aab46a 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 +#include #include #include #include diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index 1721d7211ed..241748d50f9 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 +#include //#define XI2_TOUCH_DEBUG #ifdef XI2_TOUCH_DEBUG #include diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index b9d7852696f..0aa473ce65c 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp index 2652e887553..5ad23a858bf 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -44,7 +44,7 @@ #include "qxcbscreen.h" #include #include -#include +#include #include #include #include diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 0983759fadc..0b362c52568 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -50,7 +50,7 @@ #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index d07442e4ef0..370db82a078 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -94,7 +94,7 @@ #include #include -#include +#include #include diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index e53896f82c3..a779c294cba 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 -#include -#include +#include +#include #include #include "private/qguiapplication_p.h" diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index fb7a34baca1..0afc208571c 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -57,8 +57,8 @@ #include #include -#include -#include +#include +#include #include #include "qdesktopwidget_qpa_p.h" diff --git a/sync.profile b/sync.profile index 623dfd8a263..d63cdc0934e 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 f7f0f8d28cb..5e063fb266f 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include diff --git a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp index 8a0246c71ed..278fe67cbf9 100644 --- a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp +++ b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -#include +#include #include diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index 694a76f3550..485a9724a50 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include 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 0346284e618..0f9cf2b5d84 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -#include +#include #include diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp index fb27df55555..4b44d1aa322 100644 --- a/tests/auto/other/gestures/tst_gestures.cpp +++ b/tests/auto/other/gestures/tst_gestures.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index f98946d7948..fc91ba23b37 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -69,7 +69,7 @@ #include #endif -#include +#include QT_BEGIN_NAMESPACE diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp index 67117eb51af..969ec895962 100644 --- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp +++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include // #include