From 450f79ea15e0fc3c977aea2a7c513d384b3746b4 Mon Sep 17 00:00:00 2001 From: Vladimir Belyavsky Date: Thu, 19 Sep 2024 16:31:07 +0300 Subject: [PATCH] QWindowsFontDatabase: use categorized logging more Use "qt.qpa.fonts" logging category for the rest warning messages in QWindowsFontDatabase. Task-number: QTBUG-129118 Pick-to: 6.8 Change-Id: I4e84af29fb6385142285954b0f508b412823c679 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/windows/qwindowsfontdatabase.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp index adc06a6c2ab..772620d65af 100644 --- a/src/gui/text/windows/qwindowsfontdatabase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabase.cpp @@ -771,7 +771,7 @@ QT_WARNING_POP QString actualFontName = font.changeFamilyName(uniqueFamilyName); if (actualFontName.isEmpty()) { - qWarning("%s: Can't change family name of font", __FUNCTION__); + qCWarning(lcQpaFonts, "%s: Can't change family name of font", __FUNCTION__); return 0; } @@ -786,7 +786,7 @@ QT_WARNING_POP } if (fontHandle == 0) { - qWarning("%s: AddFontMemResourceEx failed", __FUNCTION__); + qCWarning(lcQpaFonts, "%s: AddFontMemResourceEx failed", __FUNCTION__); } else { QFontDef request; request.families = QStringList(uniqueFamilyName); @@ -801,7 +801,7 @@ QT_WARNING_POP if (fontEngine) { if (request.families != fontEngine->fontDef.families) { - qWarning("%s: Failed to load font. Got fallback instead: %s", __FUNCTION__, + qCWarning(lcQpaFonts, "%s: Failed to load font. Got fallback instead: %s", __FUNCTION__, qPrintable(fontEngine->fontDef.families.constFirst())); if (fontEngine->ref.loadRelaxed() == 0) delete fontEngine; @@ -1262,7 +1262,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q directWriteFontFace->Release(); } else if (useDw) { const QString errorString = qt_error_string(int(hr)); - qWarning().noquote().nospace() << "DirectWrite: CreateFontFaceFromHDC() failed (" + qCWarning(lcQpaFonts).noquote().nospace() << "DirectWrite: CreateFontFaceFromHDC() failed (" << errorString << ") for " << request << ' ' << lf << " dpi=" << dpi; }