aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-11-02 19:32:39 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-11-02 19:52:11 +0100
commit5375e3521015381f920f61f6d93f53cd0a9bcf28 (patch)
treea7021fd783bb1296b4343398428cc390fedeabb8 /src/quick
parente645dd72df3e7b8083a1969ac3fdef111eb3123d (diff)
Get rid of all instance usage of QFontDatabase
All QFontDatabase APIs are static, use them accordingly. Task-number: QTBUG-88114 Change-Id: Iaa6be07e47adcdb5115e475cc5228f403e9a2b27 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp3
-rw-r--r--src/quick/util/qquickglobal.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 0e024bea8a..87d308d243 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -311,8 +311,7 @@ static QStringList qExtractFontFamiliesFromString(QStringView fontFamiliesString
static bool qSetFontFamilyFromTokens(QFont &font, const QStringList &fontFamilyTokens)
{
for (const QString &fontFamilyToken : fontFamilyTokens) {
- QFontDatabase fontDatabase;
- if (fontDatabase.hasFamily(fontFamilyToken)) {
+ if (QFontDatabase::hasFamily(fontFamilyToken)) {
font.setFamily(fontFamilyToken);
return true;
} else {
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index ab6cb24bfb..0639533bac 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -311,8 +311,7 @@ public:
QStringList fontFamilies() override
{
- QFontDatabase database;
- return database.families();
+ return QFontDatabase::families();
}
bool openUrlExternally(QUrl &url) override