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>
---
 tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 2 +-
 tests/auto/gui/kernel/qscreen/tst_qscreen.cpp                 | 2 +-
 tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp         | 2 +-
 tests/auto/gui/kernel/qwindow/tst_qwindow.cpp                 | 2 +-
 tests/auto/other/gestures/tst_gestures.cpp                    | 2 +-
 tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp   | 2 +-
 tests/auto/widgets/util/qscroller/tst_qscroller.cpp           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index f7f0f8d28c..5e063fb266 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -43,7 +43,7 @@
 #include <QtTest/QtTest>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 
 #include <QDebug>
 
diff --git a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
index 8a0246c71e..278fe67cbf 100644
--- a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
+++ b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qscreen.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 
 #include <QtTest/QtTest>
 
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index 694a76f355..485a9724a5 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -42,7 +42,7 @@
 #include <QtGui>
 #include <QtWidgets>
 #include <QtTest>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 
 static QWindowSystemInterface::TouchPoint touchPoint(const QTouchEvent::TouchPoint& pt)
 {
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 0346284e61..0f9cf2b5d8 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qwindow.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 
 #include <QtTest/QtTest>
 
diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp
index fb27df5555..4b44d1aa32 100644
--- a/tests/auto/other/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
@@ -52,7 +52,7 @@
 #include <qgraphicswidget.h>
 #include <qgraphicsview.h>
 #include <qmainwindow.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 
 #include <qdebug.h>
 
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index f98946d794..fc91ba23b3 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -69,7 +69,7 @@
 #include <windows.h>
 #endif
 
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index 67117eb51a..969ec89596 100644
--- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
@@ -42,7 +42,7 @@
 #include <QtGui>
 #include <QtWidgets>
 #include <QtTest>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 
 // #include <QDebug>
 
-- 
cgit v1.2.3