mirror of https://github.com/bitcoin/bitcoin
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
105 lines
2.8 KiB
105 lines
2.8 KiB
3 years ago
|
QtGui: Fix duplication of logging category lcQpaFonts
|
||
|
|
|
||
|
|
Move it to qplatformfontdatabase.h.
|
||
|
|
|
||
|
|
Upstream commit:
|
||
|
|
- Qt 6.0: ab01885e48873fb2ad71841a3f1627fe4d9cd835
|
||
|
|
|
||
|
|
--- a/qtbase/src/gui/text/qplatformfontdatabase.cpp
|
||
|
|
+++ b/qtbase/src/gui/text/qplatformfontdatabase.cpp
|
||
|
|
@@ -52,6 +52,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,
|
||
|
|
|
||
|
|
--- a/qtbase/src/gui/text/qplatformfontdatabase.h
|
||
|
|
+++ b/qtbase/src/gui/text/qplatformfontdatabase.h
|
||
|
|
@@ -50,6 +50,7 @@
|
||
|
|
//
|
||
|
|
|
||
|
|
#include <QtGui/qtguiglobal.h>
|
||
|
|
+#include <QtCore/qloggingcategory.h>
|
||
|
|
#include <QtCore/QString>
|
||
|
|
#include <QtCore/QStringList>
|
||
|
|
#include <QtCore/QList>
|
||
|
|
@@ -62,6 +63,7 @@
|
||
|
|
|
||
|
|
QT_BEGIN_NAMESPACE
|
||
|
|
|
||
|
|
+Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
|
||
|
|
|
||
|
|
class QWritingSystemsPrivate;
|
||
|
|
|
||
|
|
|
||
|
|
--- a/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||
|
|
+++ b/qtbase/src/platformsupport/fontdatabases/mac/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)
|
||
|
|
|
||
|
|
--- a/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
|
||
|
|
+++ b/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
|
||
|
|
@@ -64,8 +64,6 @@
|
||
|
|
|
||
|
|
QT_BEGIN_NAMESPACE
|
||
|
|
|
||
|
|
-Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
|
||
|
|
-
|
||
|
|
class QCoreTextFontEngine : public QFontEngine
|
||
|
|
{
|
||
|
|
Q_GADGET
|
||
|
|
|
||
|
|
--- a/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
|
||
|
|
+++ b/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
|
||
|
|
@@ -68,8 +68,6 @@
|
||
|
|
|
||
|
|
QT_BEGIN_NAMESPACE
|
||
|
|
|
||
|
|
-Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
|
||
|
|
-
|
||
|
|
#ifndef QT_NO_DIRECTWRITE
|
||
|
|
// ### fixme: Consider direct linking of dwrite.dll once Windows Vista pre SP2 is dropped (QTBUG-49711)
|
||
|
|
|
||
|
|
|
||
|
|
--- a/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
|
||
|
|
+++ b/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
|
||
|
|
@@ -63,8 +63,6 @@
|
||
|
|
|
||
|
|
QT_BEGIN_NAMESPACE
|
||
|
|
|
||
|
|
-Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
|
||
|
|
-
|
||
|
|
class QWindowsFontEngineData
|
||
|
|
{
|
||
|
|
Q_DISABLE_COPY_MOVE(QWindowsFontEngineData)
|
||
|
|
|
||
|
|
--- a/qtbase/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
|
||
|
|
+++ b/qtbase/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
|
||
|
|
@@ -40,6 +40,7 @@
|
||
|
|
#include "qgenericunixthemes_p.h"
|
||
|
|
|
||
|
|
#include "qpa/qplatformtheme_p.h"
|
||
|
|
+#include "qpa/qplatformfontdatabase.h"
|
||
|
|
|
||
|
|
#include <QtGui/QPalette>
|
||
|
|
#include <QtGui/QFont>
|
||
|
|
@@ -76,7 +77,6 @@
|
||
|
|
QT_BEGIN_NAMESPACE
|
||
|
|
|
||
|
|
Q_DECLARE_LOGGING_CATEGORY(qLcTray)
|
||
|
|
-Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
|
||
|
|
|
||
|
|
ResourceHelper::ResourceHelper()
|
||
|
|
{
|