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

Revert "Move QWindowSystemInterface out of qpa."

Browse Source 
This reverts commit 784a877d3c.

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 <lars.knoll@nokia.com>
This commit is contained in:
Paul Olav Tvete 2012-07-26 13:23:28 +02:00 committed by Qt by Nokia
parent 328550ff00
commit 3d0af143ca
55 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/kernel/qguiapplication.cpp
View File

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

4
src/gui/kernel/qguiapplication_p.h
View File

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

2
src/gui/kernel/qplatformwindow.cpp
View File

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

2
src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp
View File

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

2
src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
View File

@ -45,7 +45,7 @@
#include <QSocketNotifier>
#include <QStringList>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QCoreApplication>
#include <private/qcore_unix_p.h>

2
src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
View File

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

2
src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
View File

@ -44,7 +44,7 @@
#include <QStringList>
#include <QGuiApplication>
#include <QScreen>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
//#define QT_QPA_MOUSEMANAGER_DEBUG

2
src/platformsupport/input/evdevtablet/qevdevtablet.cpp
View File

@ -40,7 +40,7 @@
****************************************************************************/
#include "qevdevtablet_p.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QStringList>
#include <QSocketNotifier>
#include <QGuiApplication>

2
src/platformsupport/input/evdevtouch/qevdevtouch_p.h
View File

@ -46,7 +46,7 @@
#include <QString>
#include <QList>
#include <QThread>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
QT_BEGIN_HEADER

2
src/plugins/generic/meego/qmeegointegration.cpp
View File

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

2
src/plugins/generic/tslib/qtslib.cpp
View File

@ -46,7 +46,7 @@
#include <QSocketNotifier>
#include <QStringList>
#include <QPoint>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <Qt>

2
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

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

2
src/plugins/platforms/cocoa/qcocoawindow.mm
View File

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

2
src/plugins/platforms/cocoa/qmultitouch_mac_p.h
View File

@ -57,7 +57,7 @@
#import <Cocoa/Cocoa.h>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <qhash.h>
#include <QtCore>

2
src/plugins/platforms/cocoa/qnsview.mm
View File

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

2
src/plugins/platforms/cocoa/qnswindowdelegate.mm
View File

@ -42,7 +42,7 @@
#include "qnswindowdelegate.h"
#include <QDebug>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
@implementation QNSWindowDelegate

2
src/plugins/platforms/directfb/qdirectfbinput.cpp
View File

@ -44,7 +44,7 @@
#include <QThread>
#include <QDebug>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QMouseEvent>
#include <QEvent>

2
src/plugins/platforms/directfb/qdirectfbwindow.cpp
View File

@ -44,7 +44,7 @@
#include "qdirectfbinput.h"
#include "qdirectfbscreen.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <directfb.h>

2
src/plugins/platforms/eglfs/qeglfscursor.cpp
View File

@ -40,7 +40,7 @@
****************************************************************************/
#include "qeglfscursor.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtGui/QOpenGLContext>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonArray>

2
src/plugins/platforms/eglfs/qeglfswindow.cpp
View File

@ -41,7 +41,7 @@
#include "qeglfswindow.h"
#include "qeglfshooks.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtPlatformSupport/private/qeglconvenience_p.h>

2
src/plugins/platforms/kms/qkmswindow.cpp
View File

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

2
src/plugins/platforms/minimalegl/qminimaleglwindow.cpp
View File

@ -41,7 +41,7 @@
#include "qminimaleglwindow.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/openwfd/qopenwfdwindow.cpp
View File

@ -42,7 +42,7 @@
#include "qopenwfdwindow.h"
#include "qopenwfdscreen.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
QOpenWFDWindow::QOpenWFDWindow(QWindow *window)
: QPlatformWindow(window)

2
src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp
View File

@ -41,7 +41,7 @@
#include "qqnxeventdispatcher_blackberry.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <private/qguiapplication_p.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/qnx/qqnxintegration.cpp
View File

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

2
src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp
View File

@ -43,7 +43,7 @@
#include <QDebug>
#include <QGuiApplication>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#ifdef QQNXNAVIGATOREVENTHANDLER_DEBUG
#define qNavigatorEventHandlerDebug qDebug

2
src/plugins/platforms/qnx/qqnxscreen.cpp
View File

@ -44,7 +44,7 @@
#include <QtCore/QThread>
#include <QtCore/QDebug>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <errno.h>

2
src/plugins/platforms/qnx/qqnxscreeneventhandler.h
View File

@ -42,7 +42,7 @@
#ifndef QQNXSCREENEVENTHANDLER_H
#define QQNXSCREENEVENTHANDLER_H
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <screen/screen.h>

2
src/plugins/platforms/qnx/qqnxwindow.cpp
View File

@ -47,7 +47,7 @@
#include "qqnxscreen.h"
#include <QtGui/QWindow>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtCore/QDebug>

2
src/plugins/platforms/windows/qwindowscontext.cpp
View File

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

2
src/plugins/platforms/windows/qwindowsdrag.cpp
View File

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

2
src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp
View File

@ -42,7 +42,7 @@
#include "qwindowsguieventdispatcher.h"
#include "qwindowscontext.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtCore/QStack>
#include <QtCore/QDebug>

2
src/plugins/platforms/windows/qwindowsintegration.cpp
View File

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

2
src/plugins/platforms/windows/qwindowskeymapper.cpp
View File

@ -45,7 +45,7 @@
#include "qwindowsguieventdispatcher.h"
#include <QtGui/QWindow>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtGui/QKeyEvent>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/windows/qwindowsmousehandler.cpp
View File

@ -45,7 +45,7 @@
#include "qwindowswindow.h"
#include "qwindowsintegration.h"
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtGui/QGuiApplication>
#include <QtGui/QScreen>

2
src/plugins/platforms/windows/qwindowsscreen.cpp
View File

@ -50,7 +50,7 @@
#include <QtGui/QPixmap>
#include <QtGui/QGuiApplication>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtGui/QScreen>
#include <QtCore/QDebug>

2
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -57,7 +57,7 @@
#include <QtCore/QSysInfo>
#include <QtGui/QPalette>
#include <QtGui/QGuiApplication>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/windows/qwindowswindow.cpp
View File

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

2
src/plugins/platforms/xcb/qxcbconnection.h
View File

@ -51,7 +51,7 @@
#include <QThread>
#include <QVector>
#include <QVarLengthArray>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#ifndef QT_NO_TABLETEVENT
#include <QTabletEvent>

2
src/plugins/platforms/xcb/qxcbconnection_maemo.cpp
View File

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

2
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
View File

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

2
src/plugins/platforms/xcb/qxcbdrag.cpp
View File

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

2
src/plugins/platforms/xcb/qxcbkeyboard.cpp
View File

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

2
src/plugins/platforms/xcb/qxcbscreen.cpp
View File

@ -50,7 +50,7 @@
#include <xcb/randr.h>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -94,7 +94,7 @@
#include <private/qwindow_p.h>
#include <qpa/qplatformbackingstore.h>
#include <QtGui/qwindowsysteminterface.h>
#include <qpa/qwindowsysteminterface.h>
#include <stdio.h>

4
src/widgets/kernel/qapplication_p.h
View File

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

4
src/widgets/kernel/qapplication_qpa.cpp
View File

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

5
sync.profile
View File

@ -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" );

2
tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
View File

@ -43,7 +43,7 @@
#include <QtTest/QtTest>
#include <QtGui/QGuiApplication>
#include <QtGui/QWindow>
#include <QtGui/QWindowSystemInterface>
#include <qpa/qwindowsysteminterface.h>
#include <QDebug>

2
tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
View File

@ -40,7 +40,7 @@
****************************************************************************/
#include <qscreen.h>
#include <QtGui/QWindowSystemInterface>
#include <qpa/qwindowsysteminterface.h>
#include <QtTest/QtTest>

2
tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
View File

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

2
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
View File

@ -40,7 +40,7 @@
****************************************************************************/
#include <qwindow.h>
#include <QtGui/QWindowSystemInterface>
#include <qpa/qwindowsysteminterface.h>
#include <QtTest/QtTest>

2
tests/auto/other/gestures/tst_gestures.cpp
View File

@ -52,7 +52,7 @@
#include <qgraphicswidget.h>
#include <qgraphicsview.h>
#include <qmainwindow.h>
#include <QtGui/QWindowSystemInterface>
#include <qpa/qwindowsysteminterface.h>
#include <qdebug.h>

2
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -69,7 +69,7 @@
#include <windows.h>
#endif
#include <QtGui/QWindowSystemInterface>
#include <qpa/qwindowsysteminterface.h>
QT_BEGIN_NAMESPACE

2
tests/auto/widgets/util/qscroller/tst_qscroller.cpp
View File

@ -42,7 +42,7 @@
#include <QtGui>
#include <QtWidgets>
#include <QtTest>
#include <QtGui/QWindowSystemInterface>
#include <qpa/qwindowsysteminterface.h>
// #include <QDebug>