From 07098034162d0f345662c549269ca2d4c6f36f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 28 Mar 2022 15:10:26 +0200
Subject: [PATCH] QFontDatabase: Simplify and standardize emit of
 fontDatabaseChanged signal

Change-Id: Iabb637b52de225bf8823b1c3089e50db932c0b85
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 src/gui/text/qfontdatabase.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index cbb2a34471..31ee101c13 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -315,7 +315,7 @@ void QFontDatabasePrivate::invalidate()
     fallbacksCache.clear();
     clearFamilies();
     QGuiApplicationPrivate::platformIntegration()->fontDatabase()->invalidate();
-    emit static_cast<QGuiApplication *>(QCoreApplication::instance())->fontDatabaseChanged();
+    emit qGuiApp->fontDatabaseChanged();
 }
 
 QtFontFamily *QFontDatabasePrivate::family(const QString &f, FamilyRequestFlags flags)
@@ -2179,7 +2179,7 @@ int QFontDatabasePrivate::addAppFont(const QByteArray &fontData, const QString &
     if (wasEmpty) {
         invalidate();
     } else {
-        emit qApp->fontDatabaseChanged();
+        emit qGuiApp->fontDatabaseChanged();
 
         // The font cache may have cached lookups for the font that was now
         // loaded, so it has to be flushed.