1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix minimal plugin for windows

Browse Source 
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>
This commit is contained in:
Olli Werwolff 2011-07-06 12:34:53 +02:00 committed by Oliver Wolff
parent bb34372ad5
commit 11e27a210a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
View File

@ -44,4 +44,4 @@ class QAbstractEventDispatcher;
Q_GUI_EXPORT QAbstractEventDispatcher* createUnixEventDispatcher(); Q_GUI_EXPORT QAbstractEventDispatcher* createUnixEventDispatcher();
#else #else
QAbstractEventDispatcher* createUnixEventDispatcher(); QAbstractEventDispatcher* createUnixEventDispatcher();
#endif #endif

8
src/plugins/platforms/minimal/qminimalintegration.cpp
View File

@ -41,7 +41,11 @@
#include "qminimalintegration.h" #include "qminimalintegration.h"
#include "qminimalbackingstore.h" #include "qminimalbackingstore.h"
#ifndef Q_OS_WIN
#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
#else
#include <QtCore/private/qeventdispatcher_win_p.h>
#endif
#include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/private/qpixmap_raster_p.h>
#include <QtGui/QPlatformWindow> #include <QtGui/QPlatformWindow>
@ -83,6 +87,10 @@ QPlatformBackingStore *QMinimalIntegration::createPlatformBackingStore(QWindow *
QAbstractEventDispatcher *QMinimalIntegration::createEventDispatcher() const QAbstractEventDispatcher *QMinimalIntegration::createEventDispatcher() const
{ {
#ifndef Q_OS_WIN
return createUnixEventDispatcher(); return createUnixEventDispatcher();
#else
return new QEventDispatcherWin32();
#endif
} }