Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	src/gui/painting/qdrawhelper.cpp

Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e

1 files changed, 21 insertions, 6 deletions

diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index b77aaa27c1..4064507058 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -53,6 +53,7 @@
 
 #include <private/qfontengine_p.h>
 #include <private/qcore_mac_p.h>
+#include <QtCore/qloggingcategory.h>
 
 #ifdef Q_OS_OSX
 #include <ApplicationServices/ApplicationServices.h>
@@ -63,8 +64,12 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
+
 class QCoreTextFontEngine : public QFontEngine
 {
+    Q_GADGET
+
 public:
     QCoreTextFontEngine(CTFontRef font, const QFontDef &def);
     QCoreTextFontEngine(CGFontRef font, const QFontDef &def);
@@ -118,18 +123,28 @@ public:
 
     QFontEngine::Properties properties() const override;
 
+    enum FontSmoothing { Disabled, Subpixel, Grayscale };
+    Q_ENUM(FontSmoothing);
+
+    static FontSmoothing fontSmoothing();
+    static qreal fontSmoothingGamma();
+
     static bool ct_getSfntTable(void *user_data, uint tag, uchar *buffer, uint *length);
     static QFont::Weight qtWeightFromCFWeight(float value);
 
-    static int antialiasingThreshold;
-    static QFontEngine::GlyphFormat defaultGlyphFormat;
-
     static QCoreTextFontEngine *create(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference);
+
 protected:
+    QCoreTextFontEngine(const QFontDef &def);
     void init();
-    QImage imageForGlyph(glyph_t glyph, QFixed subPixelPosition, bool colorful, const QTransform &m);
-    CTFontRef ctfont;
-    CGFontRef cgFont;
+    QImage imageForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &m);
+    void loadAdvancesForGlyphs(QVarLengthArray<CGGlyph> &cgGlyphs, QGlyphLayout *glyphs) const;
+    bool hasColorGlyphs() const;
+    bool shouldAntialias() const;
+    bool shouldSmoothFont() const;
+
+    QCFType<CTFontRef> ctfont;
+    QCFType<CGFontRef> cgFont;
     int synthesisFlags;
     CGAffineTransform transform;
     QFixed avgCharWidth;