Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

4 files changed, 58 insertions, 30 deletions

diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index e545d54ec2..e28b40c240 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -721,7 +721,7 @@ QStringList QFontconfigDatabase::fallbacksForFamily(const QString &family, QFont
 
     FcValue value;
     value.type = FcTypeString;
-    QByteArray cs = family.toUtf8();
+    const QByteArray cs = family.toUtf8();
     value.u.s = (const FcChar8 *)cs.data();
     FcPatternAdd(pattern,FC_FAMILY,value,true);
 
@@ -863,7 +863,7 @@ QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const
         return family;
 
     if (!family.isEmpty()) {
-        QByteArray cs = family.toUtf8();
+        const QByteArray cs = family.toUtf8();
         FcPatternAddString(pattern, FC_FAMILY, (const FcChar8 *) cs.constData());
     }
     FcConfigSubstitute(0, pattern, FcMatchPattern);
@@ -927,38 +927,66 @@ void QFontconfigDatabase::setupFontEngine(QFontEngineFT *engine, const QFontDef
             antialias = antialiasingEnabled - 1;
     }
 
-    QFontEngine::GlyphFormat format;
-    // try and get the pattern
+    // try to find a match for fid
+    const QFontEngine::FaceId fid = engine->faceId();
     FcPattern *pattern = FcPatternCreate();
+    FcPattern *match = nullptr;
+
+    // try a trivial match by filename - FC_FILE is highest priority, so if it matches, FcFontMatch
+    // will just find the file (fine) and spend a millisecond or so doing unnecessary work (bad).
+    if (!fid.filename.isEmpty() && QFile::exists(QString::fromUtf8(fid.filename))) {
+        FcBlanks *blanks = FcConfigGetBlanks(nullptr);
+        int count = 0;
+        FcPattern *fileMatch = FcFreeTypeQuery((const FcChar8 *)fid.filename.data(), fid.index,
+                                               blanks, &count);
+        if (fileMatch) {
+            // Apply Fontconfig configuration - FcFreeTypeQuery only returns information stored in
+            // the font file, we also want to respect system and user settings.
+            FcConfigSubstitute(0, pattern, FcMatchPattern);
+            FcDefaultSubstitute(pattern);
+            match = FcFontRenderPrepare(0, pattern, fileMatch);
+            FcPatternDestroy(fileMatch);
+        }
+    }
 
-    FcValue value;
-    value.type = FcTypeString;
-    QByteArray cs = fontDef.family.toUtf8();
-    value.u.s = (const FcChar8 *)cs.data();
-    FcPatternAdd(pattern,FC_FAMILY,value,true);
+    if (!match) {
+        FcValue value;
 
-    QFontEngine::FaceId fid = engine->faceId();
+        // Fontconfig rules might process this information for arbitrary purposes, so add it,
+        // even though we already know that it doesn't match an existing file.
+        if (!fid.filename.isEmpty()) {
+            value.type = FcTypeString;
+            value.u.s = (const FcChar8 *)fid.filename.data();
+            FcPatternAdd(pattern, FC_FILE, value, true);
 
-    if (!fid.filename.isEmpty()) {
-        value.u.s = (const FcChar8 *)fid.filename.data();
-        FcPatternAdd(pattern,FC_FILE,value,true);
+            value.type = FcTypeInteger;
+            value.u.i = fid.index;
+            FcPatternAdd(pattern, FC_INDEX, value, true);
+        }
 
-        value.type = FcTypeInteger;
-        value.u.i = fid.index;
-        FcPatternAdd(pattern,FC_INDEX,value,true);
-    }
+        const QByteArray cs = fontDef.family.toUtf8();
+        value.type = FcTypeString;
+        value.u.s = (const FcChar8 *)cs.data();
+        FcPatternAdd(pattern, FC_FAMILY, value, true);
 
-    if (fontDef.pixelSize > 0.1)
-        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontDef.pixelSize);
+        if (fontDef.pixelSize > 0.1) {
+            value.type = FcTypeDouble;
+            value.u.d = fontDef.pixelSize;
+            FcPatternAdd(pattern, FC_PIXEL_SIZE, value, true);
+        }
 
-    FcResult result;
+        FcResult result;
 
-    FcConfigSubstitute(0, pattern, FcMatchPattern);
-    FcDefaultSubstitute(pattern);
+        FcConfigSubstitute(0, pattern, FcMatchPattern);
+        FcDefaultSubstitute(pattern);
 
-    FcPattern *match = FcFontMatch(0, pattern, &result);
+        match = FcFontMatch(0, pattern, &result);
+    }
+
+    QFontEngine::GlyphFormat format;
     if (match) {
-        engine->setDefaultHintStyle(defaultHintStyleFromMatch((QFont::HintingPreference)fontDef.hintingPreference, match, useXftConf));
+        engine->setDefaultHintStyle(defaultHintStyleFromMatch(
+            (QFont::HintingPreference)fontDef.hintingPreference, match, useXftConf));
 
         FcBool fc_autohint;
         if (FcPatternGetBool(match, FC_AUTOHINT,0, &fc_autohint) == FcResultMatch)
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
index 99666bcec6..8d0a20f7b9 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
@@ -254,7 +254,7 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id,
         }
         newFreetype->face = face;
 
-        newFreetype->ref.store(1);
+        newFreetype->ref.storeRelaxed(1);
         newFreetype->xsize = 0;
         newFreetype->ysize = 0;
         newFreetype->matrix.xx = 0x10000;
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
index 2d1d5e6572..2765db2946 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
@@ -116,11 +116,11 @@ private:
     friend class QFontEngineFT;
     friend class QtFreetypeData;
     friend struct QScopedPointerDeleter<QFreetypeFace>;
-    QFreetypeFace() : _lock(QMutex::Recursive) {}
+    QFreetypeFace() = default;
     ~QFreetypeFace() {}
     void cleanup();
     QAtomicInt ref;
-    QMutex _lock;
+    QRecursiveMutex _lock;
     QByteArray fontData;
 
     QFontEngine::Holder hbFace;
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index 9d25422ca5..79f7eb3d43 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -1364,11 +1364,11 @@ QT_WARNING_POP
                 if (request.family != fontEngine->fontDef.family) {
                     qWarning("%s: Failed to load font. Got fallback instead: %s",
                              __FUNCTION__, qPrintable(fontEngine->fontDef.family));
-                    if (fontEngine->ref.load() == 0)
+                    if (fontEngine->ref.loadRelaxed() == 0)
                         delete fontEngine;
                     fontEngine = 0;
                 } else {
-                    Q_ASSERT(fontEngine->ref.load() == 0);
+                    Q_ASSERT(fontEngine->ref.loadRelaxed() == 0);
 
                     // Override the generated font name
                     switch (fontEngine->type()) {
@@ -1845,7 +1845,7 @@ LOGFONT QWindowsFontDatabase::fontDefToLOGFONT(const QFontDef &request, const QS
 
     QString fam = faceName;
     if (fam.isEmpty())
-        fam = request.family;
+        fam = request.families.size() > 0 ? request.families.at(0) : request.family;
     if (Q_UNLIKELY(fam.size() >= LF_FACESIZE)) {
         qCritical("%s: Family name '%s' is too long.", __FUNCTION__, qPrintable(fam));
         fam.truncate(LF_FACESIZE - 1);