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/eglfs | |
| 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/eglfs')
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfscursor.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfswindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp index 14d1cde0ea..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.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 e09664a71b..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.h> +#include <qpa/qwindowsysteminterface.h> #include <QtPlatformSupport/private/qeglconvenience_p.h> |