AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtGui: Fix duplication of logging category lcQpaFonts

Browse Source 
Move it to qplatformfontdatabase.h.
Amends 6be9830d86.

Task-number: QTBUG-83255
Change-Id: I0a3807dc49128c8ddd1dfe7d725528c1a852950b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Friedemann Kleint 2020-06-18 08:16:56 +02:00
parent add1807d44
commit ab01885e48
6 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/coretext/qfontengine_coretext.mm
View File

@ -86,8 +86,6 @@
QT_BEGIN_NAMESPACE 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); 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) bool QCoreTextFontEngine::ct_getSfntTable(void *user_data, uint tag, uchar *buffer, uint *length)

2
src/gui/text/coretext/qfontengine_coretext_p.h
View File

@ -64,8 +64,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
class Q_GUI_EXPORT QCoreTextFontEngine : public QFontEngine class Q_GUI_EXPORT QCoreTextFontEngine : public QFontEngine
{ {
Q_GADGET Q_GADGET

2
src/gui/text/qplatformfontdatabase.cpp
View File

@ -53,6 +53,8 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
void qt_registerFont(const QString &familyname, const QString &stylename, void qt_registerFont(const QString &familyname, const QString &stylename,
const QString &foundryname, int weight, const QString &foundryname, int weight,
QFont::Style style, int stretch, bool antialiased, QFont::Style style, int stretch, bool antialiased,

2
src/gui/text/qplatformfontdatabase.h
View File

@ -50,6 +50,7 @@
// //
#include <QtGui/qtguiglobal.h> #include <QtGui/qtguiglobal.h>
#include <QtCore/qloggingcategory.h>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QList> #include <QtCore/QList>
@ -63,6 +64,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
class QWritingSystemsPrivate; class QWritingSystemsPrivate;

2
src/gui/text/windows/qwindowsfontdatabase.cpp
View File

@ -67,8 +67,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
#if QT_CONFIG(directwrite) #if QT_CONFIG(directwrite)
// ### fixme: Consider direct linking of dwrite.dll once Windows Vista pre SP2 is dropped (QTBUG-49711) // ### fixme: Consider direct linking of dwrite.dll once Windows Vista pre SP2 is dropped (QTBUG-49711)

2
src/gui/text/windows/qwindowsfontdatabasebase_p.h
View File

@ -65,8 +65,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts);
class QWindowsFontEngineData class QWindowsFontEngineData
{ {
Q_DISABLE_COPY_MOVE(QWindowsFontEngineData) Q_DISABLE_COPY_MOVE(QWindowsFontEngineData)