diff options
| author | Olli Werwolff <qt-info@nokia.com> | 2011-07-06 12:34:53 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@nokia.com> | 2011-07-07 10:25:16 +0200 |
| commit | 11e27a210ab7d4093ac71f1c58d6e96445841b67 (patch) | |
| tree | 9de6d9bff6c8212367c63c8120bdd3d082b7b56c /src | |
| parent | bb34372ad53e6bce00220814ef3586ba51eacc06 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h index 06221ee075..690d81ab66 100644 --- 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 a12ac3657a..d9f4801f70 100644 --- 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 } |