5 files changed, 41 insertions, 11 deletions

diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 8528f59844..bfce38797a 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -53,7 +53,6 @@ QAbstractTextDocumentLayoutPrivate::~QAbstractTextDocumentLayoutPrivate()
 
 QTextObjectInterface::~QTextObjectInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index f2fd585835..1f9e899413 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -826,7 +826,19 @@ QStringList QPlatformFontDatabase::fallbacksForFamily(const QString &family, QFo
 
         f->ensurePopulated();
 
-        if (writingSystem > QFontDatabase::Any && f->writingSystems[writingSystem] != QtFontFamily::Supported)
+        size_t otherWritingSystem = writingSystem;
+
+        while (writingSystem > QFontDatabase::Any && f->writingSystems[otherWritingSystem] != QtFontFamily::Supported) {
+            otherWritingSystem = std::find(scriptForWritingSystem + (otherWritingSystem + 1),
+                                     scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
+                                     script) - scriptForWritingSystem;
+
+            if (otherWritingSystem >= QFontDatabase::WritingSystemsCount) {
+                break;
+            }
+        }
+
+        if (otherWritingSystem >= QFontDatabase::WritingSystemsCount)
             continue;
 
         for (int j = 0; j < f->count; ++j) {
@@ -2857,9 +2869,10 @@ QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
 
 Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script, const QStringList &families)
 {
-    size_t writingSystem = std::find(scriptForWritingSystem,
-                                     scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
-                                     script) - scriptForWritingSystem;
+    const size_t writingSystem =
+            std::find(scriptForWritingSystem,
+                      scriptForWritingSystem + QFontDatabase::WritingSystemsCount, script)
+            - scriptForWritingSystem;
     if (writingSystem == QFontDatabase::Any
             || writingSystem >= QFontDatabase::WritingSystemsCount) {
         return families;
@@ -2879,9 +2892,30 @@ Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script
             }
         }
 
+        bool isSupported = false;
+
+        if (testFamily != nullptr) {
+            isSupported = testFamily->writingSystems[writingSystem] & QtFontFamily::Supported;
+            auto otherWritingSystem = writingSystem;
+
+            // test other writing systems
+            while (!isSupported) {
+                otherWritingSystem =
+                        std::find(&scriptForWritingSystem[otherWritingSystem + 1],
+                                  scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
+                                  script)
+                        - scriptForWritingSystem;
+
+                if (otherWritingSystem >= QFontDatabase::WritingSystemsCount)
+                    break;
+
+                isSupported |=
+                        testFamily->writingSystems[otherWritingSystem] & QtFontFamily::Supported;
+            }
+        }
+
         uint order = i;
-        if (testFamily == nullptr
-              || (testFamily->writingSystems[writingSystem] & QtFontFamily::Supported) == 0) {
+        if (!isSupported) {
             order |= 1u << 31;
         }
 
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 80b092f177..63e6b48e4f 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
 
 
 class QStringList;
-template <class T> class QList;
 struct QFontDef;
 class QFontEngine;
 
diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp
index e00f9d058c..d636bca510 100644
--- a/src/gui/text/qfontengine_qpf2.cpp
+++ b/src/gui/text/qfontengine_qpf2.cpp
@@ -168,7 +168,7 @@ const QFontEngineQPF2::Glyph *QFontEngineQPF2::findGlyph(glyph_t g) const
 
 bool QFontEngineQPF2::verifyHeader(const uchar *data, int size)
 {
-    VERIFY(quintptr(data) % Q_ALIGNOF(Header) == 0);
+    VERIFY(quintptr(data) % alignof(Header) == 0);
     VERIFY(size >= int(sizeof(Header)));
     const Header *header = reinterpret_cast<const Header *>(data);
     if (header->magic[0] != 'Q'
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index 8b57278633..a90d73dc43 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -48,8 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
-template <typename T> class QList;
 struct QTextOptionPrivate;
 
 class Q_GUI_EXPORT QTextOption