Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I554a2762890391b3b6013c8b82211a8386a4ced8

1 files changed, 4 insertions, 4 deletions

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index ac4a8f35f8..201a82864f 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -159,7 +159,7 @@ void QCoreTextFontDatabase::populateFamily(const QString &familyName)
     // A single family might match several different fonts with different styles eg.
     QCFType<CFArrayRef> matchingFonts = (CFArrayRef) CTFontDescriptorCreateMatchingFontDescriptors(nameOnlyDescriptor, 0);
     if (!matchingFonts) {
-        qWarning() << "QCoreTextFontDatabase: Found no matching fonts for family" << familyName;
+        qCWarning(lcQpaFonts) << "QCoreTextFontDatabase: Found no matching fonts for family" << familyName;
         return;
     }
 
@@ -400,20 +400,20 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family)
     auto attributes = @{ id(kCTFontFamilyNameAttribute): family.toNSString() };
     QCFType<CTFontDescriptorRef> fontDescriptor = CTFontDescriptorCreateWithAttributes(CFDictionaryRef(attributes));
     if (!fontDescriptor) {
-        qWarning() << "Failed to create fallback font descriptor for" << family;
+        qCWarning(lcQpaFonts) << "Failed to create fallback font descriptor for" << family;
         return QStringList();
     }
 
     QCFType<CTFontRef> font = CTFontCreateWithFontDescriptor(fontDescriptor, 12.0, 0);
     if (!font) {
-        qWarning() << "Failed to create fallback font for" << family;
+        qCWarning(lcQpaFonts) << "Failed to create fallback font for" << family;
         return QStringList();
     }
 
     QCFType<CFArrayRef> cascadeList = CFArrayRef(CTFontCopyDefaultCascadeListForLanguages(font,
         (CFArrayRef)[NSUserDefaults.standardUserDefaults stringArrayForKey:@"AppleLanguages"]));
     if (!cascadeList) {
-        qWarning() << "Failed to create fallback cascade list for" << family;
+        qCWarning(lcQpaFonts) << "Failed to create fallback cascade list for" << family;
         return QStringList();
     }