Make QPlatformIntegration not have a factory for eventdispatcher

but rather an accessor for the guiThreadEventDispatcher

Change-Id: I1b9ba14efc9f338c5a67e3e24ddb0caf76c07413
Reviewed-on: http://codereview.qt.nokia.com/2321
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 5a31fb5df1..6442f290d2 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -318,7 +318,7 @@ void QGuiApplicationPrivate::createEventDispatcher()
         createPlatformIntegration();
 
     if (!eventDispatcher) {
-        QAbstractEventDispatcher *eventDispatcher = platform_integration->createEventDispatcher();
+        QAbstractEventDispatcher *eventDispatcher = platform_integration->guiThreadEventDispatcher();
         setEventDispatcher(eventDispatcher);
     }
 }
@@ -327,9 +327,9 @@ void QGuiApplicationPrivate::setEventDispatcher(QAbstractEventDispatcher *eventD
 {
     Q_Q(QGuiApplication);
 
-    if (!this->eventDispatcher) {
-        this->eventDispatcher = eventDispatcher;
-        this->eventDispatcher->setParent(q);
+    if (!QCoreApplicationPrivate::eventDispatcher) {
+        QCoreApplicationPrivate::eventDispatcher = eventDispatcher;
+        QCoreApplicationPrivate::eventDispatcher->setParent(q);
         threadData->eventDispatcher = eventDispatcher;
     }
 
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h
index 35dfe07140..b355f4ff12 100644
--- a/src/gui/kernel/qplatformintegration_qpa.h
+++ b/src/gui/kernel/qplatformintegration_qpa.h
@@ -83,7 +83,7 @@ public:
     virtual QPlatformGLContext *createPlatformGLContext(QGuiGLContext *context) const;
 
 // Event dispatcher:
-    virtual QAbstractEventDispatcher *createEventDispatcher() const = 0;
+    virtual QAbstractEventDispatcher *guiThreadEventDispatcher() const = 0;
 
 //Deeper window system integrations
     virtual QPlatformFontDatabase *fontDatabase() const;