From 3d0af143ca51af0a3cbd81a794e6726992f9a86b Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@nokia.com>
Date: Thu, 26 Jul 2012 13:23:28 +0200
Subject: 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>
---
 src/plugins/generic/meego/qmeegointegration.cpp | 2 +-
 src/plugins/generic/tslib/qtslib.cpp            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/generic')

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>
 
-- 
cgit v1.2.3