diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-07-29 09:47:19 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-07-29 09:50:44 +0200 |
| commit | db9b79f71519f5fb85732b5c759795750509f727 (patch) | |
| tree | ee9a255ec503e4b319a8dbc6128ba8422fc2a1bb /src/plugins/platforms | |
| parent | dfd72c6e6c5aab58bd56c8f7854e94df2230bd8d (diff) | |
Fix compilation of Minimalplugin, add documentation.
Change-Id: I3b40eed781905610cc3062d25dcccf5f760de1f0
Reviewed-on: http://codereview.qt.nokia.com/2382
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 20 | ||||
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.h | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 8d8e5e7f06..2f2da6967a 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -48,10 +48,19 @@ #endif #include <QtGui/private/qpixmap_raster_p.h> +#include <QtGui/private/qguiapplication_p.h> #include <QtGui/QPlatformWindow> -QMinimalIntegration::QMinimalIntegration() +QT_BEGIN_NAMESPACE + +QMinimalIntegration::QMinimalIntegration() : +#ifdef Q_OS_WIN + m_eventDispatcher(new QEventDispatcherWin32()) +#else + m_eventDispatcher(createUnixEventDispatcher()) +#endif { + QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher); QMinimalScreen *mPrimaryScreen = new QMinimalScreen(); mPrimaryScreen->mGeometry = QRect(0, 0, 240, 320); @@ -80,12 +89,9 @@ QPlatformBackingStore *QMinimalIntegration::createPlatformBackingStore(QWindow * return new QMinimalBackingStore(window); } -QAbstractEventDispatcher *QMinimalIntegration::createEventDispatcher() const +QAbstractEventDispatcher *QMinimalIntegration::guiThreadEventDispatcher() const { -#ifndef Q_OS_WIN - return createUnixEventDispatcher(); -#else - return new QEventDispatcherWin32(); -#endif + return m_eventDispatcher; } +QT_END_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h index d64932c5e6..0835c39ab6 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.h +++ b/src/plugins/platforms/minimal/qminimalintegration.h @@ -73,8 +73,10 @@ public: QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; + QAbstractEventDispatcher *guiThreadEventDispatcher() const; - QAbstractEventDispatcher *createEventDispatcher() const; +private: + QAbstractEventDispatcher *m_eventDispatcher; }; QT_END_NAMESPACE |