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/platforms/xcb/qxcbconnection.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugins/platforms/xcb/qxcbconnection.h')

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