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/gui/kernel/qguiapplication_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gui/kernel/qguiapplication_p.h')

diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index b3cafc5d2c..58a82a9cc5 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -49,8 +49,8 @@
 
 #include <QtCore/private/qthread_p.h>
 
-#include <QWindowSystemInterface>
-#include "private/qwindowsysteminterface_p.h"
+#include <qpa/qwindowsysteminterface.h>
+#include <qpa/qwindowsysteminterface_p.h>
 #include "private/qshortcutmap_p.h"
 #include <qicon.h>
 
-- 
cgit v1.2.3