diff options
Diffstat (limited to 'src/plugins/platforms/minimal/qminimalintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index bfdcda1a84..a11012a81a 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -46,9 +46,7 @@ #include <qpa/qwindowsysteminterface.h> #include <QtGui/private/qfreetypefontdatabase_p.h> -#if defined(Q_OS_WINRT) -# include <QtFontDatabaseSupport/private/qwinrtfontdatabase_p.h> -#elif defined(Q_OS_WIN) +#if defined(Q_OS_WIN) # include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h> # if QT_CONFIG(freetype) # include <QtFontDatabaseSupport/private/qwindowsfontdatabase_ft_p.h> @@ -68,8 +66,6 @@ #if !defined(Q_OS_WIN) #include <QtEventDispatcherSupport/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 @@ -139,9 +135,7 @@ public: QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const { if (!m_fontDatabase && (m_options & EnableFonts)) { -#if defined(Q_OS_WINRT) - m_fontDatabase = new QWinRTFontDatabase; -#elif defined(Q_OS_WIN) +#if defined(Q_OS_WIN) if (m_options & FreeTypeFontDatabase) { # if QT_CONFIG(freetype) m_fontDatabase = new QWindowsFontDatabaseFT; @@ -190,11 +184,7 @@ QPlatformBackingStore *QMinimalIntegration::createPlatformBackingStore(QWindow * QAbstractEventDispatcher *QMinimalIntegration::createEventDispatcher() const { #ifdef Q_OS_WIN -#ifndef Q_OS_WINRT return new QEventDispatcherWin32; -#else // !Q_OS_WINRT - return new QEventDispatcherWinRT; -#endif // Q_OS_WINRT #else return createUnixEventDispatcher(); #endif |