diff options
Diffstat (limited to 'src/platformsupport/fontdatabases')
-rw-r--r-- | src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp | 22 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp index f214184c36..9f4b182ece 100644 --- a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp @@ -129,6 +129,17 @@ static QFontDatabase::WritingSystem writingSystemFromUnicodeRange(const DWRITE_U return QFontDatabase::Other; } +QWinRTFontDatabase::~QWinRTFontDatabase() +{ + qCDebug(lcQpaFonts) << __FUNCTION__; + + foreach (IDWriteFontFile *fontFile, m_fonts.keys()) + fontFile->Release(); + + foreach (IDWriteFontFamily *fontFamily, m_fontFamilies) + fontFamily->Release(); +} + QString QWinRTFontDatabase::fontDir() const { qCDebug(lcQpaFonts) << __FUNCTION__; @@ -146,17 +157,6 @@ QString QWinRTFontDatabase::fontDir() const return fontDirectory; } -QWinRTFontDatabase::~QWinRTFontDatabase() -{ - qCDebug(lcQpaFonts) << __FUNCTION__; - - foreach (IDWriteFontFile *fontFile, m_fonts.keys()) - fontFile->Release(); - - foreach (IDWriteFontFamily *fontFamily, m_fontFamilies) - fontFamily->Release(); -} - QFont QWinRTFontDatabase::defaultFont() const { return QFont(QStringLiteral("Segoe UI")); diff --git a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h index e0971c4e95..3b803d7613 100644 --- a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h @@ -70,8 +70,8 @@ struct FontDescription class QWinRTFontDatabase : public QBasicFontDatabase { public: - QString fontDir() const; ~QWinRTFontDatabase(); + QString fontDir() const override; QFont defaultFont() const override; bool fontsAlwaysScalable() const override; void populateFontDatabase() override; |