diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2012-07-26 13:23:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 00:38:09 +0200 |
| commit | 3d0af143ca51af0a3cbd81a794e6726992f9a86b (patch) | |
| tree | 76425c1863d878b016d4cb35e94d30df146b1e37 /src/plugins/platforms/qnx | |
| parent | 328550ff008da53d865f3a6f245aa4753d1b3527 (diff) | |
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 <lars.knoll@nokia.com>
Diffstat (limited to 'src/plugins/platforms/qnx')
6 files changed, 6 insertions, 6 deletions
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> |