Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"

3 files changed, 55 insertions, 26 deletions

diff --git a/src/platformsupport/fbconvenience/qfbwindow.cpp b/src/platformsupport/fbconvenience/qfbwindow.cpp
index 36f92b8cea..9f5f87d9d6 100644
--- a/src/platformsupport/fbconvenience/qfbwindow.cpp
+++ b/src/platformsupport/fbconvenience/qfbwindow.cpp
@@ -45,11 +45,12 @@
 
 QT_BEGIN_NAMESPACE
 
+static QBasicAtomicInt winIdGenerator = Q_BASIC_ATOMIC_INITIALIZER(0);
+
 QFbWindow::QFbWindow(QWindow *window)
     : QPlatformWindow(window), mBackingStore(0), mWindowState(Qt::WindowNoState)
 {
-    static QAtomicInt winIdGenerator(1);
-    mWindowId = winIdGenerator.fetchAndAddRelaxed(1);
+    mWindowId = winIdGenerator.fetchAndAddRelaxed(1) + 1;
 }
 
 QFbWindow::~QFbWindow()
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index 7abf295782..e28b40c240 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -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_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;