Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into refs/staging/5.11

6 files changed, 32 insertions, 25 deletions

diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
index 674ab29012..7a9a98573e 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -45,7 +45,7 @@
 #include <QtPlatformHeaders/QEGLNativeContext>
 #include <QDebug>
 
-#ifdef Q_OS_ANDROID
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
 #include <QtCore/private/qjnihelpers_p.h>
 #endif
 #ifndef Q_OS_WIN
@@ -332,7 +332,7 @@ void QEGLPlatformContext::updateFormatFromGL()
                 QByteArray version = QByteArray(reinterpret_cast<const char *>(s));
                 int major, minor;
                 if (QPlatformOpenGLContext::parseOpenGLVersion(version, major, minor)) {
-#ifdef Q_OS_ANDROID
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
                     // Some Android 4.2.2 devices report OpenGL ES 3.0 without the functions being available.
                     static int apiLevel = QtAndroidPrivate::androidSdkVersion();
                     if (apiLevel <= 17 && major >= 3) {
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
index beec8e763c..cc0246b64a 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
@@ -993,9 +993,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags,
 static inline bool areMetricsTooLarge(const QFontEngineFT::GlyphInfo &info)
 {
     // false if exceeds QFontEngineFT::Glyph metrics
-    return (short)(info.linearAdvance) != info.linearAdvance
-            || (uchar)(info.width) != info.width
-            || (uchar)(info.height) != info.height;
+    return info.width > 0xFF || info.height > 0xFF;
 }
 
 static inline void transformBoundingBox(int *left, int *top, int *right, int *bottom, FT_Matrix *matrix)
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
index f5585da7de..d498b0ac8b 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
@@ -133,7 +133,7 @@ public:
     /* we don't cache glyphs that are too large anyway, so we can make this struct rather small */
     struct Glyph {
         ~Glyph();
-        short linearAdvance;
+        int linearAdvance : 22;
         unsigned char width;
         unsigned char height;
         short x;
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 2edee51989..5eb5cd8a30 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -507,6 +507,23 @@ static QString familyNameFromPostScriptName(NSString *psName)
 }
 #endif
 
+static void addExtraFallbacks(QStringList *fallbackList)
+{
+#if defined(Q_OS_MACOS)
+    // Since we are only returning a list of default fonts for the current language, we do not
+    // cover all unicode completely. This was especially an issue for some of the common script
+    // symbols such as mathematical symbols, currency or geometric shapes. To minimize the risk
+    // of missing glyphs, we add Arial Unicode MS as a final fail safe, since this covers most
+    // of Unicode 2.1.
+    if (!fallbackList->contains(QStringLiteral("Arial Unicode MS")))
+        fallbackList->append(QStringLiteral("Arial Unicode MS"));
+    // Since some symbols (specifically Braille) are not in Arial Unicode MS, we
+    // add Apple Symbols to cover those too.
+    if (!fallbackList->contains(QStringLiteral("Apple Symbols")))
+        fallbackList->append(QStringLiteral("Apple Symbols"));
+#endif
+}
+
 QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const
 {
     Q_UNUSED(style);
@@ -534,16 +551,7 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo
                         fallbackList.append(QString::fromCFString(fallbackFamilyName));
                     }
 
-#if defined(Q_OS_OSX)
-                    // Since we are only returning a list of default fonts for the current language, we do not
-                    // cover all unicode completely. This was especially an issue for some of the common script
-                    // symbols such as mathematical symbols, currency or geometric shapes. To minimize the risk
-                    // of missing glyphs, we add Arial Unicode MS as a final fail safe, since this covers most
-                    // of Unicode 2.1.
-                    if (!fallbackList.contains(QStringLiteral("Arial Unicode MS")))
-                        fallbackList.append(QStringLiteral("Arial Unicode MS"));
-#endif
-
+                    addExtraFallbacks(&fallbackList);
                     extern QStringList qt_sort_families_by_writing_system(QChar::Script, const QStringList &);
                     fallbackList = qt_sort_families_by_writing_system(script, fallbackList);
 
@@ -584,14 +592,7 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo
 
             fallbackList.append(QLatin1String("Apple Color Emoji"));
 
-            // Since we are only returning a list of default fonts for the current language, we do not
-            // cover all unicode completely. This was especially an issue for some of the common script
-            // symbols such as mathematical symbols, currency or geometric shapes. To minimize the risk
-            // of missing glyphs, we add Arial Unicode MS as a final fail safe, since this covers most
-            // of Unicode 2.1.
-            if (!fallbackList.contains(QStringLiteral("Arial Unicode MS")))
-                fallbackList.append(QStringLiteral("Arial Unicode MS"));
-
+            addExtraFallbacks(&fallbackList);
             fallbackLists[styleLookupKey.arg(fallbackStyleHint)] = fallbackList;
         }
 #else
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index 675f689ace..25ff69d877 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -182,6 +182,14 @@ public:
         : QCoreTextFontEngine(font, def)
         , m_fontData(fontData)
     {}
+    QFontEngine *cloneWithSize(qreal pixelSize) const
+    {
+        QFontDef newFontDef = fontDef;
+        newFontDef.pixelSize = pixelSize;
+        newFontDef.pointSize = pixelSize * 72.0 / qt_defaultDpi();
+
+        return new QCoreTextRawFontEngine(cgFont, newFontDef, m_fontData);
+    }
     QByteArray m_fontData;
 };
 
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index 1f7b346909..b77aaa27c1 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -125,7 +125,7 @@ public:
     static QFontEngine::GlyphFormat defaultGlyphFormat;
 
     static QCoreTextFontEngine *create(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference);
-private:
+protected:
     void init();
     QImage imageForGlyph(glyph_t glyph, QFixed subPixelPosition, bool colorful, const QTransform &m);
     CTFontRef ctfont;