Fix minimal plugin for windows

Change-Id: Ica017cdad4c8205706b42767035d834498b63037
Reviewed-on: http://codereview.qt.nokia.com/1268
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
index 06221ee..690d81a 100644 (file)
--- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
+++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
@@ -44,4 +44,4 @@ class QAbstractEventDispatcher;
 Q_GUI_EXPORT QAbstractEventDispatcher* createUnixEventDispatcher();
 #else
 QAbstractEventDispatcher* createUnixEventDispatcher();
-#endif
\ No newline at end of file
+#endif

diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index a12ac36..d9f4801 100644 (file)
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -41,7 +41,11 @@
 
 #include "qminimalintegration.h"
 #include "qminimalbackingstore.h"
+#ifndef Q_OS_WIN
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#else
+#include <QtCore/private/qeventdispatcher_win_p.h>
+#endif
 
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtGui/QPlatformWindow>
@@ -83,6 +87,10 @@ QPlatformBackingStore *QMinimalIntegration::createPlatformBackingStore(QWindow *
 
 QAbstractEventDispatcher *QMinimalIntegration::createEventDispatcher() const
 {
+#ifndef Q_OS_WIN
     return createUnixEventDispatcher();
+#else
+    return new QEventDispatcherWin32();
+#endif
 }