summaryrefslogtreecommitdiff
path: root/vcl/qt5/QtGraphics_Text.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/qt5/QtGraphics_Text.cxx')
-rw-r--r--vcl/qt5/QtGraphics_Text.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/qt5/QtGraphics_Text.cxx b/vcl/qt5/QtGraphics_Text.cxx
index 9859ff02f061..940578c5d8bf 100644
--- a/vcl/qt5/QtGraphics_Text.cxx
+++ b/vcl/qt5/QtGraphics_Text.cxx
@@ -92,7 +92,6 @@ void QtGraphics::GetDevFontList(vcl::font::PhysicalFontCollection* pPFC)
if (pPFC->Count())
return;
- QFontDatabase aFDB;
FreetypeManager& rFontManager = FreetypeManager::get();
psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
::std::vector<psp::fontID> aList;
@@ -118,9 +117,16 @@ void QtGraphics::GetDevFontList(vcl::font::PhysicalFontCollection* pPFC)
if (bUseFontconfig)
SalGenericInstance::RegisterFontSubstitutors(pPFC);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ for (auto& family : QFontDatabase::families())
+ for (auto& style : QFontDatabase::styles(family))
+ pPFC->Add(QtFontFace::fromQFontDatabase(family, style));
+#else
+ QFontDatabase aFDB;
for (auto& family : aFDB.families())
for (auto& style : aFDB.styles(family))
pPFC->Add(QtFontFace::fromQFontDatabase(family, style));
+#endif
}
void QtGraphics::ClearDevFontCache() {}