diff options
Diffstat (limited to 'src/plugins/platforms/winrt/qwinrtfontdatabase.cpp')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtfontdatabase.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp b/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp index 09edea52e7..c348faf015 100644 --- a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp +++ b/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp @@ -39,13 +39,11 @@ #include <QtCore/QCoreApplication> #include <QtCore/QFile> -#ifdef QT_WINRT_USE_DWRITE #include <QtCore/QUuid> #include <QtGui/private/qfontengine_ft_p.h> #include <dwrite_1.h> #include <wrl.h> using namespace Microsoft::WRL; -#endif // QT_WINRT_USE_DWRITE QT_BEGIN_NAMESPACE @@ -122,9 +120,7 @@ QString QWinRTFontDatabase::fontDir() const const QString applicationDirPath = QCoreApplication::applicationDirPath(); fontDirectory = applicationDirPath + QLatin1String("/fonts"); if (!QFile::exists(fontDirectory)) { -#ifdef QT_WINRT_USE_DWRITE if (m_fontFamilies.isEmpty()) -#endif qWarning("No fonts directory found in application package."); fontDirectory = applicationDirPath; } @@ -132,8 +128,6 @@ QString QWinRTFontDatabase::fontDir() const return fontDirectory; } -#ifdef QT_WINRT_USE_DWRITE - QWinRTFontDatabase::~QWinRTFontDatabase() { foreach (IDWriteFontFile *fontFile, m_fonts.keys()) @@ -449,13 +443,4 @@ void QWinRTFontDatabase::releaseHandle(void *handle) QBasicFontDatabase::releaseHandle(handle); } -#else // QT_WINRT_USE_DWRITE - -QFont QWinRTFontDatabase::defaultFont() const -{ - return QFont(QFontDatabase().families().value(0)); -} - -#endif // !QT_WINRT_USE_DWRITE - QT_END_NAMESPACE |