From c172ae81c93ed8de8e8c080b849a6c7ba66a71d2 Mon Sep 17 00:00:00 2001
From: Ian Dean <ian@mediator-software.com>
Date: Wed, 17 Apr 2013 11:50:06 +0200
Subject: [PATCH] Move iOS event dispatcher from platform plugin to platform
 support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move iOS event dispatcher from platform plugin to platform support, so
that it can be used by multiple iOS platform plugins.

Change-Id: I9041b2de5e00e5fe8f30af2dfd922b4f5c594802
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
---
 src/platformsupport/eventdispatchers/eventdispatchers.pri | 8 ++++++++
 .../eventdispatchers}/qioseventdispatcher.mm              | 3 +--
 .../eventdispatchers/qioseventdispatcher_p.h}             | 0
 src/plugins/platforms/ios/ios.pro                         | 2 --
 src/plugins/platforms/ios/qiosintegration.mm              | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)
 rename src/{plugins/platforms/ios => platformsupport/eventdispatchers}/qioseventdispatcher.mm (99%)
 rename src/{plugins/platforms/ios/qioseventdispatcher.h => platformsupport/eventdispatchers/qioseventdispatcher_p.h} (100%)

diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri
index 6e16a46b34..ec556486b1 100644
--- a/src/platformsupport/eventdispatchers/eventdispatchers.pri
+++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri
@@ -8,6 +8,14 @@ HEADERS +=\
     $$PWD/qgenericunixeventdispatcher_p.h\
 }
 
+ios {
+OBJECTIVE_SOURCES +=\
+    $$PWD/qioseventdispatcher.mm
+
+HEADERS +=\
+    $$PWD/qioseventdispatcher_p.h
+}
+
 contains(QT_CONFIG, glib) {
     SOURCES +=$$PWD/qeventdispatcher_glib.cpp
     HEADERS +=$$PWD/qeventdispatcher_glib_p.h
diff --git a/src/plugins/platforms/ios/qioseventdispatcher.mm b/src/platformsupport/eventdispatchers/qioseventdispatcher.mm
similarity index 99%
rename from src/plugins/platforms/ios/qioseventdispatcher.mm
rename to src/platformsupport/eventdispatchers/qioseventdispatcher.mm
index e9bf039047..f8f8cc15ad 100644
--- a/src/plugins/platforms/ios/qioseventdispatcher.mm
+++ b/src/platformsupport/eventdispatchers/qioseventdispatcher.mm
@@ -39,8 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qioseventdispatcher.h"
-#import "qiosapplicationdelegate.h"
+#include "qioseventdispatcher_p.h"
 #include <qdebug.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <QtCore/QThread>
diff --git a/src/plugins/platforms/ios/qioseventdispatcher.h b/src/platformsupport/eventdispatchers/qioseventdispatcher_p.h
similarity index 100%
rename from src/plugins/platforms/ios/qioseventdispatcher.h
rename to src/platformsupport/eventdispatchers/qioseventdispatcher_p.h
diff --git a/src/plugins/platforms/ios/ios.pro b/src/plugins/platforms/ios/ios.pro
index 6ce0ca748e..f485191c2b 100644
--- a/src/plugins/platforms/ios/ios.pro
+++ b/src/plugins/platforms/ios/ios.pro
@@ -13,7 +13,6 @@ OBJECTIVE_SOURCES = \
     qiosintegration.mm \
     qioswindow.mm \
     qiosscreen.mm \
-    qioseventdispatcher.mm \
     qiosbackingstore.mm \
     qiosapplicationdelegate.mm \
     qiosviewcontroller.mm \
@@ -26,7 +25,6 @@ HEADERS = \
     qiosintegration.h \
     qioswindow.h \
     qiosscreen.h \
-    qioseventdispatcher.h \
     qiosbackingstore.h \
     qiosapplicationdelegate.h \
     qiosviewcontroller.h \
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index d04864d724..c6d189abec 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -43,11 +43,11 @@
 #include "qioswindow.h"
 #include "qiosbackingstore.h"
 #include "qiosscreen.h"
-#include "qioseventdispatcher.h"
 #include "qioscontext.h"
 #include "qiosinputcontext.h"
 #include "qiostheme.h"
 
+#include <QtPlatformSupport/private/qioseventdispatcher_p.h>
 #include <QtPlatformSupport/private/qcoretextfontdatabase_p.h>
 #include <QDir>