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/xcb | |
| 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/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_maemo.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbkeyboard.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
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> |