From ab01885e48873fb2ad71841a3f1627fe4d9cd835 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 18 Jun 2020 08:16:56 +0200 Subject: QtGui: Fix duplication of logging category lcQpaFonts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move it to qplatformfontdatabase.h. Amends 6be9830d865be32f224e15d13ddefd9c7e176553. Task-number: QTBUG-83255 Change-Id: I0a3807dc49128c8ddd1dfe7d725528c1a852950b Reviewed-by: Tor Arne Vestbø --- src/gui/text/coretext/qfontengine_coretext.mm | 2 -- src/gui/text/coretext/qfontengine_coretext_p.h | 2 -- src/gui/text/qplatformfontdatabase.cpp | 2 ++ src/gui/text/qplatformfontdatabase.h | 2 ++ src/gui/text/windows/qwindowsfontdatabase.cpp | 2 -- src/gui/text/windows/qwindowsfontdatabasebase_p.h | 2 -- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/gui/text/coretext/qfontengine_coretext.mm b/src/gui/text/coretext/qfontengine_coretext.mm index 68de945351..7f9eb2d78d 100644 --- a/src/gui/text/coretext/qfontengine_coretext.mm +++ b/src/gui/text/coretext/qfontengine_coretext.mm @@ -86,8 +86,6 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts") - static float SYNTHETIC_ITALIC_SKEW = std::tan(14.f * std::acos(0.f) / 90.f); bool QCoreTextFontEngine::ct_getSfntTable(void *user_data, uint tag, uchar *buffer, uint *length) diff --git a/src/gui/text/coretext/qfontengine_coretext_p.h b/src/gui/text/coretext/qfontengine_coretext_p.h index fe8161ee8d..1239072677 100644 --- a/src/gui/text/coretext/qfontengine_coretext_p.h +++ b/src/gui/text/coretext/qfontengine_coretext_p.h @@ -64,8 +64,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts) - class Q_GUI_EXPORT QCoreTextFontEngine : public QFontEngine { Q_GADGET diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index 0e19f6866f..be86a38ec8 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts") + void qt_registerFont(const QString &familyname, const QString &stylename, const QString &foundryname, int weight, QFont::Style style, int stretch, bool antialiased, diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h index 2d25d9a036..14fa444d3d 100644 --- a/src/gui/text/qplatformfontdatabase.h +++ b/src/gui/text/qplatformfontdatabase.h @@ -50,6 +50,7 @@ // #include +#include #include #include #include @@ -63,6 +64,7 @@ QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts) class QWritingSystemsPrivate; diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp index e20b53c7c0..dab7fda3fd 100644 --- a/src/gui/text/windows/qwindowsfontdatabase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabase.cpp @@ -67,8 +67,6 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts") - #if QT_CONFIG(directwrite) // ### fixme: Consider direct linking of dwrite.dll once Windows Vista pre SP2 is dropped (QTBUG-49711) diff --git a/src/gui/text/windows/qwindowsfontdatabasebase_p.h b/src/gui/text/windows/qwindowsfontdatabasebase_p.h index 4e0324183d..873912f8ef 100644 --- a/src/gui/text/windows/qwindowsfontdatabasebase_p.h +++ b/src/gui/text/windows/qwindowsfontdatabasebase_p.h @@ -65,8 +65,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts); - class QWindowsFontEngineData { Q_DISABLE_COPY_MOVE(QWindowsFontEngineData) -- cgit v1.2.3