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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 5555422b82..97e73f0723 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -208,7 +208,7 @@ QFontPrivate::~QFontPrivate()
     scFont = 0;
 }
 
-extern QMutex *qt_fontdatabase_mutex();
+extern QRecursiveMutex *qt_fontdatabase_mutex();
 
 #define QT_FONT_ENGINE_FROM_DATA(data, script) data->engines[script]
 
@@ -2799,12 +2799,12 @@ void QFontCache::cleanup()
         cache->setLocalData(0);
 }
 
-QBasicAtomicInt font_cache_id = Q_BASIC_ATOMIC_INITIALIZER(1);
+static QBasicAtomicInt font_cache_id = Q_BASIC_ATOMIC_INITIALIZER(0);
 
 QFontCache::QFontCache()
     : QObject(), total_cost(0), max_cost(min_cost),
       current_timestamp(0), fast(false), timer_id(-1),
-      m_id(font_cache_id.fetchAndAddRelaxed(1))
+      m_id(font_cache_id.fetchAndAddRelaxed(1) + 1)
 {
 }