Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/plugins/platforms/minimal/qminimalintegration.cpp
	src/plugins/platforms/offscreen/qoffscreenintegration.cpp

Change-Id: Ica85deeab5c5038ac004718e25194b1157343480

2 files changed, 13 insertions, 11 deletions

diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
index aafa90c0fd..76881db6fc 100644
--- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp
@@ -99,18 +99,12 @@ public:
 QOffscreenIntegration::QOffscreenIntegration()
 {
 #if defined(Q_OS_UNIX)
-    m_eventDispatcher = createUnixEventDispatcher();
 #if defined(Q_OS_MAC)
     m_fontDatabase.reset(new QPlatformFontDatabase());
 #else
     m_fontDatabase.reset(new QGenericUnixFontDatabase());
 #endif
 #elif defined(Q_OS_WIN)
-#ifndef Q_OS_WINRT
-    m_eventDispatcher = new QOffscreenEventDispatcher<QEventDispatcherWin32>();
-#else
-    m_eventDispatcher = new QOffscreenEventDispatcher<QEventDispatcherWinRT>();
-#endif
     m_fontDatabase.reset(new QBasicFontDatabase());
 #endif
 
@@ -119,7 +113,6 @@ QOffscreenIntegration::QOffscreenIntegration()
 #endif
     m_services.reset(new QPlatformServices);
 
-    QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher);
     screenAdded(new QOffscreenScreen);
 }
 
@@ -149,9 +142,19 @@ QPlatformBackingStore *QOffscreenIntegration::createPlatformBackingStore(QWindow
     return new QOffscreenBackingStore(window);
 }
 
-QAbstractEventDispatcher *QOffscreenIntegration::guiThreadEventDispatcher() const
+QAbstractEventDispatcher *QOffscreenIntegration::createEventDispatcher() const
 {
-    return m_eventDispatcher;
+#if defined(Q_OS_UNIX)
+    return createUnixEventDispatcher();
+#elif defined(Q_OS_WIN)
+#ifndef Q_OS_WINRT
+    return new QOffscreenEventDispatcher<QEventDispatcherWin32>();
+#else // !Q_OS_WINRT
+    return new QOffscreenEventDispatcher<QEventDispatcherWinRT>();
+#endif // Q_OS_WINRT
+#else
+    return 0;
+#endif
 }
 
 QPlatformFontDatabase *QOffscreenIntegration::fontDatabase() const
diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.h b/src/plugins/platforms/offscreen/qoffscreenintegration.h
index b403ce83b3..c7cdb5fdd6 100644
--- a/src/plugins/platforms/offscreen/qoffscreenintegration.h
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration.h
@@ -66,12 +66,11 @@ public:
     QPlatformServices *services() const;
 
     QPlatformFontDatabase *fontDatabase() const;
-    QAbstractEventDispatcher *guiThreadEventDispatcher() const;
+    QAbstractEventDispatcher *createEventDispatcher() const;
 
     static QOffscreenIntegration *createOffscreenIntegration();
 
 private:
-    QAbstractEventDispatcher *m_eventDispatcher;
     QScopedPointer<QPlatformFontDatabase> m_fontDatabase;
 #ifndef QT_NO_DRAGANDDROP
     QScopedPointer<QPlatformDrag> m_drag;