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/generic | |
| 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/generic')
| -rw-r--r-- | src/plugins/generic/meego/qmeegointegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/generic/tslib/qtslib.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/generic/meego/qmeegointegration.cpp b/src/plugins/generic/meego/qmeegointegration.cpp index 68766b2492..59f3e5ef06 100644 --- a/src/plugins/generic/meego/qmeegointegration.cpp +++ b/src/plugins/generic/meego/qmeegointegration.cpp @@ -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")) diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp index 1f392dc298..de95cf25a9 100644 --- a/src/plugins/generic/tslib/qtslib.cpp +++ b/src/plugins/generic/tslib/qtslib.cpp @@ -46,7 +46,7 @@ #include <QSocketNotifier> #include <QStringList> #include <QPoint> -#include <QtGui/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface.h> #include <Qt> |