diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2013-09-20 14:06:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 17:26:53 +0200 |
| commit | 81dea57593b5b28990bb7f012aae1387c8d2de33 (patch) | |
| tree | e09ac15fe3d7409244392046e3d490a42bdc0098 /src/plugins/platforms | |
| parent | d7af71b3187d9b67eb2aec04197fd41f74149497 (diff) | |
add WinRT event dispatcher
Change-Id: I40b3f896b89b99e271e1a5ca625a5193f4a7f59e
Done-with: Kamil Trzcinski
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 17 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreenintegration.cpp | 8 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 8d0586a5a3..29bd223f3f 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -41,20 +41,25 @@ #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/private/qguiapplication_p.h> #include <qpa/qplatformwindow.h> +#if !defined(Q_OS_WIN) +#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> +#elif defined(Q_OS_WINRT) +#include <QtCore/private/qeventdispatcher_winrt_p.h> +#else +#include <QtCore/private/qeventdispatcher_win_p.h> +#endif + QT_BEGIN_NAMESPACE QMinimalIntegration::QMinimalIntegration() : -#ifdef Q_OS_WIN +#if defined(Q_OS_WINRT) + m_eventDispatcher(new QEventDispatcherWinRT()) +#elif defined(Q_OS_WIN) m_eventDispatcher(new QEventDispatcherWin32()) #else m_eventDispatcher(createUnixEventDispatcher()) diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index bce52963df..aafa90c0fd 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -52,7 +52,11 @@ #endif #elif defined(Q_OS_WIN) #include <QtPlatformSupport/private/qbasicfontdatabase_p.h> +#ifndef Q_OS_WINRT #include <QtCore/private/qeventdispatcher_win_p.h> +#else +#include <QtCore/private/qeventdispatcher_winrt_p.h> +#endif #endif #include <QtGui/private/qpixmap_raster_p.h> @@ -102,7 +106,11 @@ QOffscreenIntegration::QOffscreenIntegration() 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 |