summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/platformsupport/eventdispatchers/eventdispatchers.pri8
-rw-r--r--src/platformsupport/eventdispatchers/qioseventdispatcher.mm (renamed from src/plugins/platforms/ios/qioseventdispatcher.mm)3
-rw-r--r--src/platformsupport/eventdispatchers/qioseventdispatcher_p.h (renamed from src/plugins/platforms/ios/qioseventdispatcher.h)0
-rw-r--r--src/plugins/platforms/ios/ios.pro2
-rw-r--r--src/plugins/platforms/ios/qiosintegration.mm2
5 files changed, 10 insertions, 5 deletions
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
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
index 53a75618ce..53a75618ce 100644
--- a/src/plugins/platforms/ios/qioseventdispatcher.h
+++ b/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>