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

Conflicts:
	src/widgets/styles/qstyleanimation.cpp

Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8

1 files changed, 15 insertions, 0 deletions

diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index b4e94fe889..b8f1f95ac4 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -109,6 +109,21 @@ public:
     virtual QFontEngine *cloneWithSize(qreal pixelSize) const;
     virtual int glyphMargin(QFontEngineGlyphCache::Type type) { Q_UNUSED(type); return 0; }
 
+    static bool supportsColorGlyphs()
+    {
+#if defined(Q_OS_IOS)
+        return true;
+#elif MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+  #if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
+        return &CTFontDrawGlyphs;
+  #else
+        return true;
+  #endif
+#else
+        return false;
+#endif
+    }
+
     static int antialiasingThreshold;
     static QFontEngineGlyphCache::Type defaultGlyphFormat;