diff --git a/.gitignore b/.gitignore index 41e8fc9..f4a80ab 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /qtdeclarative-everywhere-opensource-src-5.15.6.tar.xz /qtdeclarative-everywhere-opensource-src-5.15.7.tar.xz /qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz +/qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz diff --git a/0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch b/0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch deleted file mode 100644 index ea064bc..0000000 --- a/0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3f272e04492cd884deb4e7948e39b749809d5256 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Fri, 21 May 2021 13:17:15 +0200 -Subject: [PATCH 01/21] Document that StyledText also supports   and - " - -Change-Id: I1715f8ae8ec8d0fbaf6dbe2b8663cc169da663cd -Reviewed-by: Fabian Kosmale -(cherry picked from commit 5848c081c094a66e024493fc1e5c2569e06f73b6) ---- - src/quick/items/qquicktext.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp -index 6230186933..c1571fc6f5 100644 ---- a/src/quick/items/qquicktext.cpp -+++ b/src/quick/items/qquicktext.cpp -@@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount() - - inline images -
    ,
      and
    • - ordered and unordered lists - 
       - preformatted
--    > < &
-+    > < & "  
-     \endcode
- 
-     \c Text.StyledText parser is strict, requiring tags to be correctly nested.
--- 
-2.39.0
-
diff --git a/0002-Support-apos-in-styled-text.patch b/0002-Support-apos-in-styled-text.patch
deleted file mode 100644
index a43df9d..0000000
--- a/0002-Support-apos-in-styled-text.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From bf4b4f3dfb3534e7919c50faa60a0fe7fbcdacf5 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid 
-Date: Fri, 21 May 2021 13:42:35 +0200
-Subject: [PATCH 02/21] Support ' in styled text
-
-Pick-to: 6.1 5.15
-Change-Id: I4a8db963e52a7899ab1796f9a560e8029cc1c929
-Reviewed-by: Fabian Kosmale 
-Reviewed-by: Eskil Abrahamsen Blomfeldt 
-(cherry picked from commit 96b528efcba1226d2980828d1255160bdceae4cf)
----
- src/quick/items/qquicktext.cpp      | 2 +-
- src/quick/util/qquickstyledtext.cpp | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
-index c1571fc6f5..e823ca1095 100644
---- a/src/quick/items/qquicktext.cpp
-+++ b/src/quick/items/qquicktext.cpp
-@@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount()
-      - inline images
-     
        , 
           and 
        •  - ordered and unordered lists
-     
           - preformatted
--    > < & "  
-+    > < & "   '
-     \endcode
- 
-     \c Text.StyledText parser is strict, requiring tags to be correctly nested.
-diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
-index d531fc9205..a25af90414 100644
---- a/src/quick/util/qquickstyledtext.cpp
-+++ b/src/quick/util/qquickstyledtext.cpp
-@@ -564,6 +564,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI
-                 textOut += QChar(60);
-             else if (entity == QLatin1String("amp"))
-                 textOut += QChar(38);
-+            else if (entity == QLatin1String("apos"))
-+                textOut += QChar(39);
-             else if (entity == QLatin1String("quot"))
-                 textOut += QChar(34);
-             else if (entity == QLatin1String("nbsp"))
--- 
-2.39.0
-
diff --git a/0003-Remove-unused-QPointer-QQuickPointerMask.patch b/0003-Remove-unused-QPointer-QQuickPointerMask.patch
deleted file mode 100644
index a10a96a..0000000
--- a/0003-Remove-unused-QPointer-QQuickPointerMask.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From da206ac99b58218a1e51a2e75032647d24cd0fdb Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid 
-Date: Thu, 17 Jun 2021 16:32:28 +0200
-Subject: [PATCH 03/21] Remove unused QPointer
-
-Change-Id: I009fa6bbd8599dc3bb2e810176fe20e70ed50851
-Reviewed-by: Shawn Rutledge 
-(cherry picked from commit ac03b4b8ee9cc8d4522e0c8cf1018ff086f80c1b)
----
- src/quick/items/qquickmousearea_p_p.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/quick/items/qquickmousearea_p_p.h b/src/quick/items/qquickmousearea_p_p.h
-index fba383e268..0d63618622 100644
---- a/src/quick/items/qquickmousearea_p_p.h
-+++ b/src/quick/items/qquickmousearea_p_p.h
-@@ -61,7 +61,6 @@ QT_BEGIN_NAMESPACE
- 
- class QQuickMouseEvent;
- class QQuickMouseArea;
--class QQuickPointerMask;
- class QQuickMouseAreaPrivate : public QQuickItemPrivate
- {
-     Q_DECLARE_PUBLIC(QQuickMouseArea)
-@@ -100,7 +99,6 @@ public:
- #if QT_CONFIG(quick_draganddrop)
-     QQuickDrag *drag;
- #endif
--    QPointer mask;
-     QPointF startScene;
-     QPointF targetStartPos;
-     QPointF lastPos;
--- 
-2.39.0
-
diff --git a/0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch b/0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch
deleted file mode 100644
index 3a90ba4..0000000
--- a/0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From e61200ff7222c31e73dbc779ba4a70073775cc0c Mon Sep 17 00:00:00 2001
-From: Aleix Pol 
-Date: Thu, 23 Sep 2021 03:43:04 +0200
-Subject: [PATCH 04/21] QQmlDelegateModel: Refresh the view when a column is
- added at 0
-
-It can happen that a model reports n>0 rows but columns=0 (See
-QConcatenateTablesProxyModel). In those cases we would render glitchy
-items until the elements are marked as dirty.
-
-Change-Id: I615c9cacbb1b6f9dee3898b03476605e5ac39d0a
-Reviewed-by: Ulf Hermann 
-(cherry picked from commit ec9251efb918f37971aeefa1f687d137d037ff12)
-Reviewed-by: Qt Cherry-pick Bot 
-Signed-off-by: Aleix Pol 
----
- src/qmlmodels/qqmldelegatemodel.cpp           | 44 +++++++++++++++++++
- src/qmlmodels/qqmldelegatemodel_p.h           |  3 ++
- .../data/redrawUponColumnChange.qml           | 11 +++++
- .../tst_qqmldelegatemodel.cpp                 | 27 ++++++++++++
- 4 files changed, 85 insertions(+)
- create mode 100644 tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml
-
-diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
-index 2079a8ed04..a577cb2351 100644
---- a/src/qmlmodels/qqmldelegatemodel.cpp
-+++ b/src/qmlmodels/qqmldelegatemodel.cpp
-@@ -389,6 +389,12 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel()
-                       q,  QQmlDelegateModel, SLOT(_q_rowsRemoved(QModelIndex,int,int)));
-     qmlobject_connect(aim, QAbstractItemModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-                       q,  QQmlDelegateModel, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
-+    qmlobject_connect(aim, QAbstractItemModel, SIGNAL(columnsInserted(QModelIndex,int,int)),
-+                      q, QQmlDelegateModel, SLOT(_q_columnsInserted(QModelIndex,int,int)));
-+    qmlobject_connect(aim, QAbstractItemModel, SIGNAL(columnsRemoved(QModelIndex,int,int)),
-+                      q, QQmlDelegateModel, SLOT(_q_columnsRemoved(QModelIndex,int,int)));
-+    qmlobject_connect(aim, QAbstractItemModel, SIGNAL(columnsMoved(QModelIndex,int,int,QModelIndex,int)),
-+                      q, QQmlDelegateModel, SLOT(_q_columnsMoved(QModelIndex,int,int,QModelIndex,int)));
-     qmlobject_connect(aim, QAbstractItemModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector)),
-                       q, QQmlDelegateModel, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector)));
-     qmlobject_connect(aim, QAbstractItemModel, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
-@@ -413,6 +419,12 @@ void QQmlDelegateModelPrivate::disconnectFromAbstractItemModel()
-                         q, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
-     QObject::disconnect(aim, SIGNAL(rowsRemoved(QModelIndex,int,int)),
-                         q, SLOT(_q_rowsRemoved(QModelIndex,int,int)));
-+    QObject::disconnect(aim, SIGNAL(columnsInserted(QModelIndex,int,int)), q,
-+                        SLOT(_q_columnsInserted(QModelIndex,int,int)));
-+    QObject::disconnect(aim, SIGNAL(columnsRemoved(QModelIndex,int,int)), q,
-+                        SLOT(_q_columnsRemoved(QModelIndex,int,int)));
-+    QObject::disconnect(aim, SIGNAL(columnsMoved(QModelIndex,int,int,QModelIndex,int)), q,
-+                        SLOT(_q_columnsMoved(QModelIndex,int,int,QModelIndex,int)));
-     QObject::disconnect(aim, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector)),
-                         q, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector)));
-     QObject::disconnect(aim, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
-@@ -1973,6 +1985,38 @@ void QQmlDelegateModel::_q_rowsMoved(
-     }
- }
- 
-+void QQmlDelegateModel::_q_columnsInserted(const QModelIndex &parent, int begin, int end)
-+{
-+    Q_D(QQmlDelegateModel);
-+    Q_UNUSED(end);
-+    if (parent == d->m_adaptorModel.rootIndex && begin == 0) {
-+        // mark all items as changed
-+        _q_itemsChanged(0, d->m_count, QVector());
-+    }
-+}
-+
-+void QQmlDelegateModel::_q_columnsRemoved(const QModelIndex &parent, int begin, int end)
-+{
-+    Q_D(QQmlDelegateModel);
-+    Q_UNUSED(end);
-+    if (parent == d->m_adaptorModel.rootIndex && begin == 0) {
-+        // mark all items as changed
-+        _q_itemsChanged(0, d->m_count, QVector());
-+    }
-+}
-+
-+void QQmlDelegateModel::_q_columnsMoved(const QModelIndex &parent, int start, int end,
-+                                        const QModelIndex &destination, int column)
-+{
-+    Q_D(QQmlDelegateModel);
-+    Q_UNUSED(end);
-+    if ((parent == d->m_adaptorModel.rootIndex && start == 0)
-+        || (destination == d->m_adaptorModel.rootIndex && column == 0)) {
-+        // mark all items as changed
-+        _q_itemsChanged(0, d->m_count, QVector());
-+    }
-+}
-+
- void QQmlDelegateModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end, const QVector &roles)
- {
-     Q_D(QQmlDelegateModel);
-diff --git a/src/qmlmodels/qqmldelegatemodel_p.h b/src/qmlmodels/qqmldelegatemodel_p.h
-index 8aab4badca..d140bfbaaf 100644
---- a/src/qmlmodels/qqmldelegatemodel_p.h
-+++ b/src/qmlmodels/qqmldelegatemodel_p.h
-@@ -152,6 +152,9 @@ private Q_SLOTS:
-     void _q_itemsMoved(int from, int to, int count);
-     void _q_modelReset();
-     void _q_rowsInserted(const QModelIndex &,int,int);
-+    void _q_columnsInserted(const QModelIndex &, int, int);
-+    void _q_columnsRemoved(const QModelIndex &, int, int);
-+    void _q_columnsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
-     void _q_rowsAboutToBeRemoved(const QModelIndex &parent, int begin, int end);
-     void _q_rowsRemoved(const QModelIndex &,int,int);
-     void _q_rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
-diff --git a/tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml b/tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml
-new file mode 100644
-index 0000000000..206133bb39
---- /dev/null
-+++ b/tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml
-@@ -0,0 +1,11 @@
-+import QtQuick 2.8
-+
-+ListView {
-+    id: root
-+    width: 200
-+    height: 200
-+
-+    delegate: Text {
-+        text: display
-+    }
-+}
-diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-index 35f1e2c94d..1722447830 100644
---- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-@@ -27,6 +27,8 @@
- ****************************************************************************/
- 
- #include 
-+#include 
-+#include 
- #include 
- #include 
- #include 
-@@ -47,6 +49,7 @@ private slots:
-     void filterOnGroup_removeWhenCompleted();
-     void qtbug_86017();
-     void contextAccessedByHandler();
-+    void redrawUponColumnChange();
- };
- 
- class AbstractItemModel : public QAbstractItemModel
-@@ -186,6 +189,30 @@ void tst_QQmlDelegateModel::contextAccessedByHandler()
-     QVERIFY(root->property("works").toBool());
- }
- 
-+void tst_QQmlDelegateModel::redrawUponColumnChange()
-+{
-+    QStandardItemModel m1;
-+    m1.appendRow({
-+            new QStandardItem("Banana"),
-+            new QStandardItem("Coconut"),
-+    });
-+
-+    QQuickView view(testFileUrl("redrawUponColumnChange.qml"));
-+    QCOMPARE(view.status(), QQuickView::Ready);
-+    view.show();
-+    QQuickItem *root = view.rootObject();
-+    root->setProperty("model", QVariant::fromValue(&m1));
-+
-+    QObject *item = root->property("currentItem").value();
-+    QVERIFY(item);
-+    QCOMPARE(item->property("text").toString(), "Banana");
-+
-+    QVERIFY(root);
-+    m1.removeColumn(0);
-+
-+    QCOMPARE(item->property("text").toString(), "Coconut");
-+}
-+
- QTEST_MAIN(tst_QQmlDelegateModel)
- 
- #include "tst_qqmldelegatemodel.moc"
--- 
-2.39.0
-
diff --git a/0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch b/0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch
deleted file mode 100644
index cfd0400..0000000
--- a/0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From ab781c9f5364ddfab0bfe9626a9dd01bd6bc046e Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii 
-Date: Sun, 10 Oct 2021 21:04:21 +0300
-Subject: [PATCH 05/21] Fix sweep step for tainted QObject JavaScript wrappers
-
-Currently, whenever the garbage collector runs, it will destroy all
-valid tainted wrappers.
-
-Only null or undefined wrappers will be preserved in the
-m_multiplyWrappedQObjects map.
-
-It seems like "!" was overlooked in
-3b5d37ce3841c4bfdf1c629d33f0e33b881b47fb. Prior to that change, it
-was "!it.value()->markBit()", so calling erase() in the then branch
-did make sense. But with "!it.value().isNullOrUndefined()", erase()
-will be called for every valid wrapper, which is the opposite what we
-want.
-
-Pick-to: 5.15 6.2
-Change-Id: I2bf2630f538af8cbd4bfffcff29d67be6c278265
-Reviewed-by: Fabian Kosmale 
-(cherry picked from commit e6b2f88d892dcf396580a61662f569bf69d6d9d1)
----
- src/qml/memory/qv4mm.cpp                   |  2 +-
- tests/auto/qml/qjsengine/tst_qjsengine.cpp | 39 ++++++++++++++++++++++
- tests/auto/qml/qv4mm/tst_qv4mm.cpp         |  6 ++--
- 3 files changed, 43 insertions(+), 4 deletions(-)
-
-diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
-index 06caf04e5a..da149a67c4 100644
---- a/src/qml/memory/qv4mm.cpp
-+++ b/src/qml/memory/qv4mm.cpp
-@@ -981,7 +981,7 @@ void MemoryManager::sweep(bool lastSweep, ClassDestroyStatsCallback classCountPt
- 
-     if (MultiplyWrappedQObjectMap *multiplyWrappedQObjects = engine->m_multiplyWrappedQObjects) {
-         for (MultiplyWrappedQObjectMap::Iterator it = multiplyWrappedQObjects->begin(); it != multiplyWrappedQObjects->end();) {
--            if (!it.value().isNullOrUndefined())
-+            if (it.value().isNullOrUndefined())
-                 it = multiplyWrappedQObjects->erase(it);
-             else
-                 ++it;
-diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
-index 3b7d74df63..b75bf820d5 100644
---- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
-+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
-@@ -102,6 +102,7 @@ private slots:
-     void valueConversion_RegularExpression();
-     void castWithMultipleInheritance();
-     void collectGarbage();
-+    void collectGarbageNestedWrappersTwoEngines();
-     void gcWithNestedDataStructure();
-     void stacktrace();
-     void numberParsing_data();
-@@ -1809,6 +1810,44 @@ void tst_QJSEngine::collectGarbage()
-     QVERIFY(ptr.isNull());
- }
- 
-+class TestObjectContainer : public QObject
-+{
-+    Q_OBJECT
-+    Q_PROPERTY(QObject *dummy MEMBER m_dummy CONSTANT)
-+
-+public:
-+    TestObjectContainer() : m_dummy(new QObject(this)) {}
-+
-+private:
-+    QObject *m_dummy;
-+};
-+
-+void tst_QJSEngine::collectGarbageNestedWrappersTwoEngines()
-+{
-+    QJSEngine engine1;
-+    QJSEngine engine2;
-+
-+    TestObjectContainer container;
-+    QQmlEngine::setObjectOwnership(&container, QQmlEngine::CppOwnership);
-+
-+    engine1.globalObject().setProperty("foobar", engine1.newQObject(&container));
-+    engine2.globalObject().setProperty("foobar", engine2.newQObject(&container));
-+
-+    engine1.evaluate("foobar.dummy.baz = 42");
-+    engine2.evaluate("foobar.dummy.baz = 43");
-+
-+    QCOMPARE(engine1.evaluate("foobar.dummy.baz").toInt(), 42);
-+    QCOMPARE(engine2.evaluate("foobar.dummy.baz").toInt(), 43);
-+
-+    engine1.collectGarbage();
-+    engine2.collectGarbage();
-+
-+    // The GC should not collect dummy object wrappers neither in engine1 nor engine2, we
-+    // verify that by checking whether the baz property still has its previous value.
-+    QCOMPARE(engine1.evaluate("foobar.dummy.baz").toInt(), 42);
-+    QCOMPARE(engine2.evaluate("foobar.dummy.baz").toInt(), 43);
-+}
-+
- void tst_QJSEngine::gcWithNestedDataStructure()
- {
-     // The GC must be able to traverse deeply nested objects, otherwise this
-diff --git a/tests/auto/qml/qv4mm/tst_qv4mm.cpp b/tests/auto/qml/qv4mm/tst_qv4mm.cpp
-index 5d635aa63b..824fd89e5b 100644
---- a/tests/auto/qml/qv4mm/tst_qv4mm.cpp
-+++ b/tests/auto/qml/qv4mm/tst_qv4mm.cpp
-@@ -76,10 +76,10 @@ void tst_qv4mm::multiWrappedQObjects()
-         QCOMPARE(engine1.memoryManager->m_pendingFreedObjectWrapperValue.size(), 1);
-         QCOMPARE(engine2.memoryManager->m_pendingFreedObjectWrapperValue.size(), 0);
- 
--        // Moves the additional WeakValue from m_multiplyWrappedQObjects to
--        // m_pendingFreedObjectWrapperValue. It's still alive after all.
-+        // The additional WeakValue from m_multiplyWrappedQObjects hasn't been moved
-+        // to m_pendingFreedObjectWrapperValue yet. It's still alive after all.
-         engine1.memoryManager->runGC();
--        QCOMPARE(engine1.memoryManager->m_pendingFreedObjectWrapperValue.size(), 2);
-+        QCOMPARE(engine1.memoryManager->m_pendingFreedObjectWrapperValue.size(), 1);
- 
-         // engine2 doesn't own the object as engine1 was the first to wrap it above.
-         // Therefore, no effect here.
--- 
-2.39.0
-
diff --git a/0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch b/0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch
deleted file mode 100644
index c49f6d2..0000000
--- a/0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From b8f474a4dd5fa58edfba73e565499bcdad679291 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= 
-Date: Thu, 3 Sep 2020 10:51:01 +0200
-Subject: [PATCH 06/21] Fix TapHandler so that it actually registers a tap
-
-This bug caused all quick examples that used the
-shared\LauncherList.qml to be broken.
-
-In QtGui, QSinglePointEvent will construct itself with a point id of 0
-if there is a valid point, and with a point id of -1 if the point is
-invalid (the default constructor does the latter).
-However, QQuickSinglePointHandler::wantsPointerEvent() did not agree
-with that, because it assumed that a point id of 0 meant
-uninitialized/invalid point.
-The fix is to change QQuickSinglePointHandler::wantsPointerEvent() and
-QQuickHandlerPoint so that it assumes that the id -1 is now an invalid
-point, (instead of 0)
-
-Change-Id: I8c9683dfe06ebb77c5342a26f08174b67e7cbd90
-Reviewed-by: Shawn Rutledge 
-(cherry picked from commit 8d3a91016506fd0afedb0be535f7c34a4ca762f6)
----
- src/quick/handlers/qquickhandlerpoint.cpp       | 4 ++--
- src/quick/handlers/qquicksinglepointhandler.cpp | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/quick/handlers/qquickhandlerpoint.cpp b/src/quick/handlers/qquickhandlerpoint.cpp
-index 72efdfd0f4..6aef3545dd 100644
---- a/src/quick/handlers/qquickhandlerpoint.cpp
-+++ b/src/quick/handlers/qquickhandlerpoint.cpp
-@@ -82,7 +82,7 @@ void QQuickHandlerPoint::localize(QQuickItem *item)
- 
- void QQuickHandlerPoint::reset()
- {
--    m_id = 0;
-+    m_id = -1;
-     m_uniqueId = QPointingDeviceUniqueId();
-     m_position = QPointF();
-     m_scenePosition = QPointF();
-@@ -165,7 +165,7 @@ void QQuickHandlerPoint::reset(const QVector &points)
-         pressureSum += point.pressure();
-         ellipseDiameterSum += point.ellipseDiameters();
-     }
--    m_id = 0;
-+    m_id = -1;
-     m_uniqueId = QPointingDeviceUniqueId();
-     // all points are required to be from the same event, so pressed buttons and modifiers should be the same
-     m_pressedButtons = points.first().pressedButtons();
-diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp
-index b51f53b74f..89081b4e84 100644
---- a/src/quick/handlers/qquicksinglepointhandler.cpp
-+++ b/src/quick/handlers/qquicksinglepointhandler.cpp
-@@ -75,7 +75,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event)
-     if (!QQuickPointerDeviceHandler::wantsPointerEvent(event))
-         return false;
- 
--    if (d->pointInfo.id()) {
-+    if (d->pointInfo.id() != -1) {
-         // We already know which one we want, so check whether it's there.
-         // It's expected to be an update or a release.
-         // If we no longer want it, cancel the grab.
-@@ -125,7 +125,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event)
-             chosen->setAccepted();
-         }
-     }
--    return d->pointInfo.id();
-+    return d->pointInfo.id() != -1;
- }
- 
- void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
--- 
-2.39.0
-
diff --git a/0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch b/0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch
deleted file mode 100644
index 413e137..0000000
--- a/0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From de04cfb654a09fe7d0f8454b8a8de9243284e1d2 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid 
-Date: Tue, 16 Nov 2021 22:43:37 +0100
-Subject: [PATCH 07/21] Revert "Fix TapHandler so that it actually registers a
- tap"
-
-This reverts commit 36e8ccd434f948e4f11a8f9d59139ec072e41ff5.
-
-It's causing regresions
----
- src/quick/handlers/qquickhandlerpoint.cpp       | 4 ++--
- src/quick/handlers/qquicksinglepointhandler.cpp | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/quick/handlers/qquickhandlerpoint.cpp b/src/quick/handlers/qquickhandlerpoint.cpp
-index 6aef3545dd..72efdfd0f4 100644
---- a/src/quick/handlers/qquickhandlerpoint.cpp
-+++ b/src/quick/handlers/qquickhandlerpoint.cpp
-@@ -82,7 +82,7 @@ void QQuickHandlerPoint::localize(QQuickItem *item)
- 
- void QQuickHandlerPoint::reset()
- {
--    m_id = -1;
-+    m_id = 0;
-     m_uniqueId = QPointingDeviceUniqueId();
-     m_position = QPointF();
-     m_scenePosition = QPointF();
-@@ -165,7 +165,7 @@ void QQuickHandlerPoint::reset(const QVector &points)
-         pressureSum += point.pressure();
-         ellipseDiameterSum += point.ellipseDiameters();
-     }
--    m_id = -1;
-+    m_id = 0;
-     m_uniqueId = QPointingDeviceUniqueId();
-     // all points are required to be from the same event, so pressed buttons and modifiers should be the same
-     m_pressedButtons = points.first().pressedButtons();
-diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp
-index 89081b4e84..b51f53b74f 100644
---- a/src/quick/handlers/qquicksinglepointhandler.cpp
-+++ b/src/quick/handlers/qquicksinglepointhandler.cpp
-@@ -75,7 +75,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event)
-     if (!QQuickPointerDeviceHandler::wantsPointerEvent(event))
-         return false;
- 
--    if (d->pointInfo.id() != -1) {
-+    if (d->pointInfo.id()) {
-         // We already know which one we want, so check whether it's there.
-         // It's expected to be an update or a release.
-         // If we no longer want it, cancel the grab.
-@@ -125,7 +125,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event)
-             chosen->setAccepted();
-         }
-     }
--    return d->pointInfo.id() != -1;
-+    return d->pointInfo.id();
- }
- 
- void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
--- 
-2.39.0
-
diff --git a/0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch b/0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch
deleted file mode 100644
index 568f207..0000000
--- a/0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 99ada3c3d329b6d7136b0425841dcaa654c9c05b Mon Sep 17 00:00:00 2001
-From: Marc Mutz 
-Date: Tue, 21 Dec 2021 09:20:17 +0100
-Subject: [PATCH 08/21] QQmlJs::FixedPoolArray: fix UB (precondition violation)
- in allocate()
-
-Says ubsan:
-
-  qqmljsfixedpoolarray_p.h:90:19: runtime error: null pointer passed as argument 2, which is declared to never be null
-
-Fix, like in so many other places, by a size check.
-
-Pick-to: 6.3 6.2 5.15
-Change-Id: I9181d6ecb467c2dc726978ce7f93b35a6bf2f944
-Reviewed-by: Lars Knoll 
-(cherry picked from commit d74e931f3fc2587ac6d1e2930acbbe54ea5be2b5)
----
- src/qml/common/qqmljsfixedpoolarray_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qml/common/qqmljsfixedpoolarray_p.h b/src/qml/common/qqmljsfixedpoolarray_p.h
-index b65b994d6c..15a8cd6878 100644
---- a/src/qml/common/qqmljsfixedpoolarray_p.h
-+++ b/src/qml/common/qqmljsfixedpoolarray_p.h
-@@ -86,7 +86,7 @@ public:
-         if (QTypeInfo::isComplex) {
-             for (int i = 0; i < count; ++i)
-                 new (data + i) T(vector.at(i));
--        } else {
-+        } else if (count) {
-             memcpy(data, static_cast(vector.constData()), count * sizeof(T));
-         }
-     }
--- 
-2.39.0
-
diff --git a/0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch b/0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch
deleted file mode 100644
index e87e423..0000000
--- a/0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b964ba12bf118afbbf42cd9e4e7b4903ad107060 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann 
-Date: Thu, 3 Feb 2022 10:02:06 +0100
-Subject: [PATCH 09/21] V4: Do not call dtor of an object we continue to use
-
-After destroyObject(), the QObjectWrapper is still alive. We might use
-its heap object again. Furthermore, the Heap::QObjectWrapper dtor does
-not actually do anything defined. What we want to do here is clear the
-QObject pointer because we've just gotten rid of the QObject. There is a
-method for that: Heap::QObjectWrapper::destroy().
-
-Finally, the internalClass must never ever be nullptr. Assert on that
-rather than checking it.
-
-Pick-to: 5.15 6.2 6.3
-Task-number: QTBUG-100431
-Change-Id: I794a295c182b2ed4ba80673f58d6143c861b7391
-Reviewed-by: Andrei Golubev 
-Reviewed-by: Qt CI Bot 
-Reviewed-by: Fabian Kosmale 
-(cherry picked from commit 6c197319f34b8098d034f1543eb5feb9d7be54c3)
----
- src/qml/jsruntime/qv4qobjectwrapper.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
-index e57cdd8278..94613598af 100644
---- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
-+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
-@@ -1145,8 +1145,7 @@ void Heap::QObjectWrapper::markObjects(Heap::Base *that, QV4::MarkStack *markSta
- void QObjectWrapper::destroyObject(bool lastCall)
- {
-     Heap::QObjectWrapper *h = d();
--    if (!h->internalClass)
--        return; // destroyObject already got called
-+    Q_ASSERT(h->internalClass);
- 
-     if (h->object()) {
-         QQmlData *ddata = QQmlData::get(h->object(), false);
-@@ -1176,7 +1175,7 @@ void QObjectWrapper::destroyObject(bool lastCall)
-         }
-     }
- 
--    h->~Data();
-+    h->destroy();
- }
- 
- 
--- 
-2.39.0
-
diff --git a/0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch b/0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch
deleted file mode 100644
index 1b2fb96..0000000
--- a/0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From d8808a609a81660e9de9abc6b1b71ea01f0d6f40 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii 
-Date: Sat, 29 Jan 2022 21:59:33 +0200
-Subject: [PATCH 10/21] Make sure QQuickWidget and its offscreen window's
- screens are always in sync
-
-By default, the offscreen window is placed on the primary screen.
-However, if the parent widget argument is passed to the QQuickWidget's
-constructor, then QQuickWidget's and the offscreen window's screens can
-be different and that can create rendering issues, e.g. blurry text if
-the primary screen and QQuickWidget's screen have different scale
-factors.
-
-Change-Id: I10c62b5635664f943b11828773f14017f198a770
-Reviewed-by: David Edmundson 
-Reviewed-by: Laszlo Agocs 
-(cherry picked from commit a2a2734bffa1459639b31fb3f4f83873ba44ab5c)
----
- src/quickwidgets/qquickwidget.cpp | 26 +++++++++++---------------
- 1 file changed, 11 insertions(+), 15 deletions(-)
-
-diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
-index 39780f8de3..223d91f579 100644
---- a/src/quickwidgets/qquickwidget.cpp
-+++ b/src/quickwidgets/qquickwidget.cpp
-@@ -106,6 +106,7 @@ void QQuickWidgetPrivate::init(QQmlEngine* e)
- 
-     renderControl = new QQuickWidgetRenderControl(q);
-     offscreenWindow = new QQuickWindow(*new QQuickOffcreenWindowPrivate(),renderControl);
-+    offscreenWindow->setScreen(q->screen());
-     offscreenWindow->setTitle(QString::fromLatin1("Offscreen"));
-     offscreenWindow->setObjectName(QString::fromLatin1("QQuickOffScreenWindow"));
-     // Do not call create() on offscreenWindow.
-@@ -901,9 +902,7 @@ void QQuickWidgetPrivate::createContext()
- 
-         context = new QOpenGLContext;
-         context->setFormat(offscreenWindow->requestedFormat());
--        const QWindow *win = q->window()->windowHandle();
--        if (win && win->screen())
--            context->setScreen(win->screen());
-+        context->setScreen(q->screen());
-         QOpenGLContext *shareContext = qt_gl_global_share_context();
-         if (!shareContext)
-             shareContext = QWidgetPrivate::get(q->window())->shareContext();
-@@ -1520,19 +1519,16 @@ bool QQuickWidget::event(QEvent *e)
-         d->handleWindowChange();
-         break;
- 
--    case QEvent::ScreenChangeInternal:
--        if (QWindow *window = this->window()->windowHandle()) {
--            QScreen *newScreen = window->screen();
--
--            if (d->offscreenWindow)
--                d->offscreenWindow->setScreen(newScreen);
--            if (d->offscreenSurface)
--                d->offscreenSurface->setScreen(newScreen);
-+    case QEvent::ScreenChangeInternal: {
-+        QScreen *newScreen = screen();
-+        if (d->offscreenWindow)
-+            d->offscreenWindow->setScreen(newScreen);
-+        if (d->offscreenSurface)
-+            d->offscreenSurface->setScreen(newScreen);
- #if QT_CONFIG(opengl)
--            if (d->context)
--                d->context->setScreen(newScreen);
-+        if (d->context)
-+            d->context->setScreen(newScreen);
- #endif
--        }
- 
-         if (d->useSoftwareRenderer
- #if QT_CONFIG(opengl)
-@@ -1545,7 +1541,7 @@ bool QQuickWidget::event(QEvent *e)
-             d->render(true);
-         }
-         break;
--
-+    }
-     case QEvent::Show:
-     case QEvent::Move:
-         d->updatePosition();
--- 
-2.39.0
-
diff --git a/0011-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch b/0011-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch
deleted file mode 100644
index 50b960f..0000000
--- a/0011-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 052dba54ae335b42fdcd1c0c68c9fce0031ffe9e Mon Sep 17 00:00:00 2001
-From: Fabian Kosmale 
-Date: Wed, 4 May 2022 09:10:54 +0200
-Subject: [PATCH 11/21] QQuickItem: Guard against cycles in
- nextPrevItemInTabFocusChain
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-nextPrevItemInTabFocusChain already had a check to prevent running into
-cycles, it would however only detect if we reached the original item. If
-our cycle instead would loop between reachable items without ever
-returning to the initial one, as in the diagram below, then we would
-never terminate the loop.
-
-            /-->other item<---next item
-initial-item           \          ^
-                        \         |
-			 --->different item
-
-To prevent this from happening, we keep track of all items we've seen so
-far. One last complications arises due to the fact that we do visit the
-parent twice under some cicrcumstances, but we already have the skip
-variable to indicate that case – we simply skip the duplicate check if
-it is set to true.
-
-Pick-to: 6.2 6.3
-Fixes: QTBUG-87190
-Change-Id: I1449a7ebf8f325f00c296e8a8db4360faf1049e4
-Reviewed-by: Volker Hilsheimer 
-(cherry picked from commit e74bcf751495d9fe27efd195bc04e2a6ae6732a4)
----
- src/quick/items/qquickitem.cpp                      |  7 ++++++-
- .../data/activeFocusOnTab_infiniteLoop3.qml         | 13 +++++++++++++
- tests/auto/quick/qquickitem2/tst_qquickitem.cpp     | 12 ++++++++++++
- 3 files changed, 31 insertions(+), 1 deletion(-)
- create mode 100644 tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml
-
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index 75f1457816..9de244ed9e 100644
---- a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -59,6 +59,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- #include 
-@@ -2526,6 +2527,7 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
-     QQuickItem *current = item;
-     qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: startItem:" << startItem;
-     qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: firstFromItem:" << firstFromItem;
-+    QDuplicateTracker cycleDetector;
-     do {
-         qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: current:" << current;
-         qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: from:" << from;
-@@ -2592,7 +2594,10 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
-         // traversed all of the chain (by compare the [current] item with [startItem])
-         // Since the [startItem] might be promoted to its parent if it is invisible,
-         // we still have to check [current] item with original start item
--        if ((current == startItem || current == originalStartItem) && from == firstFromItem) {
-+        // We might also run into a cycle before we reach firstFromItem again
-+        // but note that we have to ignore current if we are meant to skip it
-+        if (((current == startItem || current == originalStartItem) && from == firstFromItem) ||
-+                (!skip && cycleDetector.hasSeen(current))) {
-             // wrapped around, avoid endless loops
-             if (item == contentItem) {
-                 qCDebug(DBG_FOCUS) << "QQuickItemPrivate::nextPrevItemInTabFocusChain: looped, return contentItem";
-diff --git a/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml b/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml
-new file mode 100644
-index 0000000000..889e480f3b
---- /dev/null
-+++ b/tests/auto/quick/qquickitem2/data/activeFocusOnTab_infiniteLoop3.qml
-@@ -0,0 +1,13 @@
-+import QtQuick 2.6
-+
-+Item {
-+    visible: true
-+    Item {
-+        visible: false
-+        Item {
-+            objectName: "hiddenChild"
-+            activeFocusOnTab: true
-+            focus: true
-+        }
-+    }
-+}
-diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-index c8f251dbe1..c8ef36ee68 100644
---- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-@@ -67,6 +67,7 @@ private slots:
-     void activeFocusOnTab10();
-     void activeFocusOnTab_infiniteLoop_data();
-     void activeFocusOnTab_infiniteLoop();
-+    void activeFocusOnTab_infiniteLoopControls();
- 
-     void nextItemInFocusChain();
-     void nextItemInFocusChain2();
-@@ -1057,6 +1058,17 @@ void tst_QQuickItem::activeFocusOnTab_infiniteLoop()
-     QCOMPARE(item, window->rootObject());
- }
- 
-+
-+void tst_QQuickItem::activeFocusOnTab_infiniteLoopControls()
-+{
-+    auto source = testFileUrl("activeFocusOnTab_infiniteLoop3.qml");
-+    QScopedPointerwindow(new QQuickView());
-+    window->setSource(source);
-+    window->show();
-+    QVERIFY(window->errors().isEmpty());
-+    QTest::keyClick(window.get(), Qt::Key_Tab); // should not hang
-+}
-+
- void tst_QQuickItem::nextItemInFocusChain()
- {
-     if (!qt_tab_all_widgets())
--- 
-2.39.0
-
diff --git a/0012-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch b/0012-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch
deleted file mode 100644
index 37a1ed4..0000000
--- a/0012-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f9faa4cfa0dbbac12cdf79e56a02b9aa0022018c Mon Sep 17 00:00:00 2001
-From: Marc Mutz 
-Date: Tue, 16 Jul 2019 11:23:37 +0200
-Subject: [PATCH 12/21] QSGOpenGLDistanceFieldGlyphCache: fix multiplication
- result truncation
-
-The type of the expression int * int is int, so truncation has already
-happened when the result is assigned to a qint64.
-
-Fix by casting one of the multiplicants to qint64 before performing
-the multiplication. This multiplication cannot overflow, because int
-is 32-bit on all supported platforms.
-
-The addition of 'size' to the pointer will still truncate the result,
-on 32bit platforms, but that check is in itself UB. A follow-up commit
-will fix the check, and with it the last truncation to 32bit.
-
-Coverity-Id: 218769
-Pick-to: 6.3 6.2 5.15
-Change-Id: I0d71950695b9743db8c96d825e68bb1e9c47de02
-Reviewed-by: Fabian Kosmale 
-Reviewed-by: Thiago Macieira 
-(cherry picked from commit cacfc1dbb9719c0ef55cff69dad0921ce1405438)
----
- src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp
-index eb4db0f85e..2c9868b335 100644
---- a/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp
-+++ b/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp
-@@ -512,7 +512,7 @@ bool QSGRhiDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &font)
- 
-             int width = texInfo->allocatedArea.width();
-             int height = texInfo->allocatedArea.height();
--            qint64 size = width * height;
-+            qint64 size = qint64(width) * height;
-             if (reinterpret_cast(textureData + size) > qtdfTableEnd) {
-                 qWarning("qtdf table too small in font '%s'.",
-                          qPrintable(font.familyName()));
--- 
-2.39.0
-
diff --git a/0013-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch b/0013-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch
deleted file mode 100644
index c66c1ac..0000000
--- a/0013-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 6d844f0250d97acdf66fd0d9cdabd26588e72333 Mon Sep 17 00:00:00 2001
-From: Marc Mutz 
-Date: Tue, 16 Jul 2019 11:31:01 +0200
-Subject: [PATCH 13/21] QSGOpenGLDistanceFieldGlyphCache: fix UB (ordering of
- pointers not from the same array)
-
-The code performed out of bounds checks by adding the size of the
-buffer to a pointer and comparing the result to the the
-one-past-the-end pointer of the buffer.
-
-This is UB, for three reasons:
-
-- in one case, a qint64 is added to a pointer, silently truncating the
-  result on 32bit platforms
-
-- if the buffer overflow is large, the pointer value may wrap around,
-  yielding a result that is numerically less than the end pointer, but
-  still out-of-bounds.
-
-- pointer order is only defined within a C array, plus one past the
-  end. On failure, pointers outside that range are compared.
-
-Fix by comparing distance(it, end) with the required size for the
-chunk to be written instead.
-
-Pick-to: 6.3 6.2 5.15
-Change-Id: I356bb8c8a65a93b8b1c1eb7bac381dd64bea719e
-Reviewed-by: Fabian Kosmale 
-Reviewed-by: Thiago Macieira 
-(cherry picked from commit 8d9bd6b381bfc759d575954801b683354ad6a790)
----
- src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp
-index 2c9868b335..2325a2665b 100644
---- a/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp
-+++ b/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp
-@@ -446,7 +446,7 @@ bool QSGRhiDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &font)
- 
-         const char *textureRecord = allocatorData;
-         for (int i = 0; i < textureCount; ++i, textureRecord += Qtdf::TextureRecordSize) {
--            if (textureRecord + Qtdf::TextureRecordSize > qtdfTableEnd) {
-+            if (qtdfTableEnd - textureRecord < Qtdf::TextureRecordSize) {
-                 qWarning("qtdf table too small in font '%s'.",
-                          qPrintable(font.familyName()));
-                 return false;
-@@ -462,7 +462,7 @@ bool QSGRhiDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &font)
- 
-         const char *glyphRecord = textureRecord;
-         for (quint32 i = 0; i < glyphCount; ++i, glyphRecord += Qtdf::GlyphRecordSize) {
--            if (glyphRecord + Qtdf::GlyphRecordSize > qtdfTableEnd) {
-+            if (qtdfTableEnd - glyphRecord < Qtdf:: GlyphRecordSize) {
-                 qWarning("qtdf table too small in font '%s'.",
-                          qPrintable(font.familyName()));
-                 return false;
-@@ -513,7 +513,7 @@ bool QSGRhiDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &font)
-             int width = texInfo->allocatedArea.width();
-             int height = texInfo->allocatedArea.height();
-             qint64 size = qint64(width) * height;
--            if (reinterpret_cast(textureData + size) > qtdfTableEnd) {
-+            if (qtdfTableEnd - reinterpret_cast(textureData) < size) {
-                 qWarning("qtdf table too small in font '%s'.",
-                          qPrintable(font.familyName()));
-                 return false;
--- 
-2.39.0
-
diff --git a/0014-Reset-currentChanges-if-currentChanges-is-active-whe.patch b/0014-Reset-currentChanges-if-currentChanges-is-active-whe.patch
deleted file mode 100644
index 521666e..0000000
--- a/0014-Reset-currentChanges-if-currentChanges-is-active-whe.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5f183c1a7b2afbe50b4071e6a862c1a6d53de7fb Mon Sep 17 00:00:00 2001
-From: Tony Leinonen 
-Date: Thu, 21 Oct 2021 14:44:02 +0300
-Subject: [PATCH 14/21] Reset currentChanges if currentChanges is active when
- refilling listView
-
-currentIndex was not getting updated because itemViewChangeSet was left
-active from previous interaction. Clear the changes if they are still
-active on refill.
-
-Task-number: QTBUG-92809
-Pick-to: 6.2 5.15
-Change-Id: I81558a5e0bfe0f880851fff85370bd5be60a5391
-Reviewed-by: Richard Moe Gustavsen 
-(cherry picked from commit 2d8033a4ffb9ca60adee29d375491d7ed2a82747)
-
-* asturmlechner 2021-11-09: Other part of 2d8033a4 is in qtquickcontrols2
-  but only consists of tests.
----
- src/quick/items/qquickitemview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
-index 010a0152e1..f8ad168a17 100644
---- a/src/quick/items/qquickitemview.cpp
-+++ b/src/quick/items/qquickitemview.cpp
-@@ -1785,7 +1785,7 @@ void QQuickItemViewPrivate::refill(qreal from, qreal to)
- 
-     do {
-         bufferPause.stop();
--        if (currentChanges.hasPendingChanges() || bufferedChanges.hasPendingChanges()) {
-+        if (currentChanges.hasPendingChanges() || bufferedChanges.hasPendingChanges() || currentChanges.active) {
-             currentChanges.reset();
-             bufferedChanges.reset();
-             releaseVisibleItems(reusableFlag);
--- 
-2.39.0
-
diff --git a/0015-Don-t-convert-QByteArray-in-startDrag.patch b/0015-Don-t-convert-QByteArray-in-startDrag.patch
deleted file mode 100644
index ee0d6f4..0000000
--- a/0015-Don-t-convert-QByteArray-in-startDrag.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4884d7f5a3dbfddd865b594db51eeb4272565f76 Mon Sep 17 00:00:00 2001
-From: Fushan Wen 
-Date: Tue, 1 Nov 2022 22:35:24 +0800
-Subject: [PATCH 15/21] Don't convert QByteArray in `startDrag`
-
-QMimeData::setData expects the provided data to contain the correctly
-encoded QByteArray, so if the variant contains a QByteArray, then take
-it as is to avoid data loss.
-
-If the variant is not already a byte array, then we ideally would make
-sure that the mime type (i.e. the key of the map) and the QVariant's
-type are compatible (image/png with a QImage works; text/plain with a
-QImage does not). This changes behavior and needs to be a follow-up
-commit.
-
-Fixes: QTBUG-71922
-Change-Id: I9b9f10fd332e1f9568f6835a69a1c359457f823c
-Reviewed-by: Volker Hilsheimer 
-(cherry picked from commit 062f9bf57657b54dc708015ec5fed3c89e5cc3ca)
-Reviewed-by: Qt Cherry-pick Bot 
-
-
-(cherry picked from commit 22de23c4bb9ac5e2c545e9de3149a7d4f8edd5ee)
----
- src/quick/items/qquickdrag.cpp | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
-index 8321fcfeed..3b50370355 100644
---- a/src/quick/items/qquickdrag.cpp
-+++ b/src/quick/items/qquickdrag.cpp
-@@ -481,7 +481,9 @@ void QQuickDragAttached::setKeys(const QStringList &keys)
-     \qmlattachedproperty stringlist QtQuick::Drag::mimeData
-     \since 5.2
- 
--    This property holds a map of mimeData that is used during startDrag.
-+    This property holds a map from mime type to data that is used during startDrag.
-+    The mime data needs to be a \c string, or an \c ArrayBuffer with the data encoded
-+    according to the mime type.
- */
- 
- QVariantMap QQuickDragAttached::mimeData() const
-@@ -766,8 +768,12 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct
-     QDrag *drag = new QDrag(source ? source : q);
-     QMimeData *mimeData = new QMimeData();
- 
--    for (auto it = externalMimeData.cbegin(), end = externalMimeData.cend(); it != end; ++it)
--        mimeData->setData(it.key(), it.value().toString().toUtf8());
-+    for (auto it = externalMimeData.cbegin(), end = externalMimeData.cend(); it != end; ++it) {
-+        if (it.value().typeId() == QMetaType::QByteArray)
-+            mimeData->setData(it.key(), it.value().toByteArray());
-+        else
-+            mimeData->setData(it.key(), it.value().toString().toUtf8());
-+    }
- 
-     drag->setMimeData(mimeData);
-     if (pixmapLoader.isReady()) {
--- 
-2.39.0
-
diff --git a/0016-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch b/0016-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch
deleted file mode 100644
index 658343b..0000000
--- a/0016-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2574ff9d5c6e72d01dca283e66436cd90a64324d Mon Sep 17 00:00:00 2001
-From: Hannah von Reth 
-Date: Sat, 5 Nov 2022 18:48:41 +0100
-Subject: [PATCH 16/21] Fix build after
- 95290f66b806a307b8da1f72f8fc2c69801933d0
-
----
- src/quick/items/qquickdrag.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
-index 3b50370355..383078b3b9 100644
---- a/src/quick/items/qquickdrag.cpp
-+++ b/src/quick/items/qquickdrag.cpp
-@@ -769,7 +769,7 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct
-     QMimeData *mimeData = new QMimeData();
- 
-     for (auto it = externalMimeData.cbegin(), end = externalMimeData.cend(); it != end; ++it) {
--        if (it.value().typeId() == QMetaType::QByteArray)
-+        if (static_cast(it.value().type()) == QMetaType::QByteArray)
-             mimeData->setData(it.key(), it.value().toByteArray());
-         else
-             mimeData->setData(it.key(), it.value().toString().toUtf8());
--- 
-2.39.0
-
diff --git a/0017-Implement-accessibility-for-QQuickWidget.patch b/0017-Implement-accessibility-for-QQuickWidget.patch
deleted file mode 100644
index 3749a8e..0000000
--- a/0017-Implement-accessibility-for-QQuickWidget.patch
+++ /dev/null
@@ -1,565 +0,0 @@
-From 6d1dd8925f160d6ad02ea646eac638675bdf9f1c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= 
-Date: Fri, 7 May 2021 10:07:50 +0200
-Subject: [PATCH 17/21] Implement accessibility for QQuickWidget
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The accessibility tree for the Qt Quick content should
-be rooted at the QQuickWidget, and not at the offscreen
-QQuickWindow.
-
-For this to be the case, several things must happen:
-  - QQuickWindow must not report the child interfaces
-  - QQuickWidget must report the child interfaces
-  - The child interfaces must report the QQuickWidget as the parent
-
-Create accessibility interfaces for QQuickWidget and
-and QQuickWigetOffscreenWindow (which now gets a proper
-subclass), where the QQuickWidget interface reports
-the child interfaces and the QQuickWigetOffscreenWindow
-reports no children
-
-Change the code in QAccessibleQuickItem to use the
-true (visible) window, where needed.
-
-Fixes: QTBUG-67290
-Change-Id: I387d0ef711138d248a8dd16eefc9839499b35eeb
-Reviewed-by: Jan Arve Sæther 
-Reviewed-by: Volker Hilsheimer 
-(cherry picked from commit 41926e08d73ea6c4bbfc87a1dd52d2cdbc435c27)
----
- src/quick/accessible/qaccessiblequickitem.cpp |  29 +++--
- src/quick/accessible/qaccessiblequickview_p.h |   2 +-
- src/quickwidgets/qaccessiblequickwidget.cpp   | 110 ++++++++++++++++++
- src/quickwidgets/qaccessiblequickwidget.h     |  84 +++++++++++++
- .../qaccessiblequickwidgetfactory.cpp         |  60 ++++++++++
- .../qaccessiblequickwidgetfactory_p.h         |  66 +++++++++++
- src/quickwidgets/qquickwidget.cpp             |  18 ++-
- src/quickwidgets/qquickwidget_p.h             |   8 ++
- src/quickwidgets/quickwidgets.pro             |   8 +-
- 9 files changed, 368 insertions(+), 17 deletions(-)
- create mode 100644 src/quickwidgets/qaccessiblequickwidget.cpp
- create mode 100644 src/quickwidgets/qaccessiblequickwidget.h
- create mode 100644 src/quickwidgets/qaccessiblequickwidgetfactory.cpp
- create mode 100644 src/quickwidgets/qaccessiblequickwidgetfactory_p.h
-
-diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
-index 85719fdc80..eb3df4d4cd 100644
---- a/src/quick/accessible/qaccessiblequickitem.cpp
-+++ b/src/quick/accessible/qaccessiblequickitem.cpp
-@@ -46,6 +46,7 @@
- #include "QtQuick/private/qquicktextinput_p.h"
- #include "QtQuick/private/qquickaccessibleattached_p.h"
- #include "QtQuick/qquicktextdocument.h"
-+#include "QtQuick/qquickrendercontrol.h"
- QT_BEGIN_NAMESPACE
- 
- #if QT_CONFIG(accessibility)
-@@ -57,7 +58,19 @@ QAccessibleQuickItem::QAccessibleQuickItem(QQuickItem *item)
- 
- QWindow *QAccessibleQuickItem::window() const
- {
--    return item()->window();
-+    QQuickWindow *window = item()->window();
-+
-+    // For QQuickWidget the above window will be the offscreen QQuickWindow,
-+    // which is not a part of the accessibility tree. Detect this case and
-+    // return the window for the QQuickWidget instead.
-+    if (window && !window->handle()) {
-+        if (QQuickRenderControl *renderControl = QQuickWindowPrivate::get(window)->renderControl) {
-+            if (QWindow *renderWindow = renderControl->renderWindow(nullptr))
-+                return renderWindow;
-+        }
-+    }
-+
-+    return window;
- }
- 
- int QAccessibleQuickItem::childCount() const
-@@ -113,19 +126,15 @@ QAccessibleInterface *QAccessibleQuickItem::childAt(int x, int y) const
- QAccessibleInterface *QAccessibleQuickItem::parent() const
- {
-     QQuickItem *parent = item()->parentItem();
--    QQuickWindow *window = item()->window();
--    QQuickItem *ci = window ? window->contentItem() : nullptr;
-+    QQuickWindow *itemWindow = item()->window();
-+    QQuickItem *ci = itemWindow ? itemWindow->contentItem() : nullptr;
-     while (parent && !QQuickItemPrivate::get(parent)->isAccessible && parent != ci)
-         parent = parent->parentItem();
- 
-     if (parent) {
-         if (parent == ci) {
--            // Jump out to the scene widget if the parent is the root item.
--            // There are two root items, QQuickWindow::rootItem and
--            // QQuickView::declarativeRoot. The former is the true root item,
--            // but is not a part of the accessibility tree. Check if we hit
--            // it here and return an interface for the scene instead.
--            return QAccessible::queryAccessibleInterface(window);
-+            // Jump out to the window if the parent is the root item
-+            return QAccessible::queryAccessibleInterface(window());
-         } else {
-             while (parent && !parent->d_func()->isAccessible)
-                 parent = parent->parentItem();
-@@ -188,7 +197,7 @@ QAccessible::State QAccessibleQuickItem::state() const
-     QRect viewRect_ = viewRect();
-     QRect itemRect = rect();
- 
--    if (viewRect_.isNull() || itemRect.isNull() || !item()->window() || !item()->window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity()))
-+    if (viewRect_.isNull() || itemRect.isNull() || !window() || !window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity()))
-         state.invisible = true;
-     if (!viewRect_.intersects(itemRect))
-         state.offscreen = true;
-diff --git a/src/quick/accessible/qaccessiblequickview_p.h b/src/quick/accessible/qaccessiblequickview_p.h
-index 39ffcaf39c..8baa01330c 100644
---- a/src/quick/accessible/qaccessiblequickview_p.h
-+++ b/src/quick/accessible/qaccessiblequickview_p.h
-@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
- 
- #if QT_CONFIG(accessibility)
- 
--class QAccessibleQuickWindow : public QAccessibleObject
-+class Q_QUICK_EXPORT QAccessibleQuickWindow : public QAccessibleObject
- {
- public:
-     QAccessibleQuickWindow(QQuickWindow *object);
-diff --git a/src/quickwidgets/qaccessiblequickwidget.cpp b/src/quickwidgets/qaccessiblequickwidget.cpp
-new file mode 100644
-index 0000000000..6f04d6693f
---- /dev/null
-+++ b/src/quickwidgets/qaccessiblequickwidget.cpp
-@@ -0,0 +1,110 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2021 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the QtQuick module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 3 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL3 included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 3 requirements
-+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 2.0 or (at your option) the GNU General
-+** Public license version 3 or any later version approved by the KDE Free
-+** Qt Foundation. The licenses are as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-+** included in the packaging of this file. Please review the following
-+** information to ensure the GNU General Public License requirements will
-+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-+** https://www.gnu.org/licenses/gpl-3.0.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "qaccessiblequickwidget.h"
-+
-+#include "qquickwidget_p.h"
-+
-+QT_BEGIN_NAMESPACE
-+
-+#if QT_CONFIG(accessibility)
-+
-+QAccessibleQuickWidget::QAccessibleQuickWidget(QQuickWidget* widget)
-+: QAccessibleWidget(widget)
-+, m_accessibleWindow(QQuickWidgetPrivate::get(widget)->offscreenWindow)
-+{
-+    // NOTE: m_accessibleWindow is a QAccessibleQuickWindow, and not a
-+    // QAccessibleQuickWidgetOffscreenWindow (defined below). This means
-+    // it will return the Quick item child interfaces, which is what's needed here
-+    // (unlike QAccessibleQuickWidgetOffscreenWindow, which will report 0 children).
-+}
-+
-+QAccessibleInterface *QAccessibleQuickWidget::child(int index) const
-+{
-+    return m_accessibleWindow.child(index);
-+}
-+
-+int QAccessibleQuickWidget::childCount() const
-+{
-+    return m_accessibleWindow.childCount();
-+}
-+
-+int QAccessibleQuickWidget::indexOfChild(const QAccessibleInterface *iface) const
-+{
-+    return m_accessibleWindow.indexOfChild(iface);
-+}
-+
-+QAccessibleInterface *QAccessibleQuickWidget::childAt(int x, int y) const
-+{
-+    return m_accessibleWindow.childAt(x, y);
-+}
-+
-+QAccessibleQuickWidgetOffscreenWindow::QAccessibleQuickWidgetOffscreenWindow(QQuickWindow *window)
-+:QAccessibleQuickWindow(window)
-+{
-+
-+}
-+
-+QAccessibleInterface *QAccessibleQuickWidgetOffscreenWindow::child(int index) const
-+{
-+    Q_UNUSED(index);
-+    return nullptr;
-+}
-+
-+int QAccessibleQuickWidgetOffscreenWindow::childCount() const
-+{
-+    return 0;
-+}
-+
-+int QAccessibleQuickWidgetOffscreenWindow::indexOfChild(const QAccessibleInterface *iface) const
-+{
-+    Q_UNUSED(iface);
-+    return -1;
-+}
-+
-+QAccessibleInterface *QAccessibleQuickWidgetOffscreenWindow::QAccessibleQuickWidgetOffscreenWindow::childAt(int x, int y) const
-+{
-+    Q_UNUSED(x);
-+    Q_UNUSED(y);
-+    return nullptr;
-+}
-+
-+#endif // accessibility
-+
-+QT_END_NAMESPACE
-diff --git a/src/quickwidgets/qaccessiblequickwidget.h b/src/quickwidgets/qaccessiblequickwidget.h
-new file mode 100644
-index 0000000000..1f52c78c46
---- /dev/null
-+++ b/src/quickwidgets/qaccessiblequickwidget.h
-@@ -0,0 +1,84 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2021 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the QtQuick module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 3 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL3 included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 3 requirements
-+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 2.0 or (at your option) the GNU General
-+** Public license version 3 or any later version approved by the KDE Free
-+** Qt Foundation. The licenses are as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-+** included in the packaging of this file. Please review the following
-+** information to ensure the GNU General Public License requirements will
-+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-+** https://www.gnu.org/licenses/gpl-3.0.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#ifndef QACCESSIBLEQUICKWIDGET_H
-+#define QACCESSIBLEQUICKWIDGET_H
-+
-+#include "qquickwidget.h"
-+#include 
-+
-+#include 
-+
-+QT_BEGIN_NAMESPACE
-+
-+#if QT_CONFIG(accessibility)
-+
-+// These classes implement the QQuickWiget accessibility switcharoo,
-+// where the child items of the QQuickWidgetOffscreenWindow are reported
-+// as child accessible interfaces of the QAccessibleQuickWidget.
-+class QAccessibleQuickWidget: public QAccessibleWidget
-+{
-+public:
-+    QAccessibleQuickWidget(QQuickWidget* widget);
-+
-+    QAccessibleInterface *child(int index) const override;
-+    int childCount() const override;
-+    int indexOfChild(const QAccessibleInterface *iface) const override;
-+    QAccessibleInterface *childAt(int x, int y) const override;
-+
-+private:
-+    QAccessibleQuickWindow m_accessibleWindow;
-+    Q_DISABLE_COPY(QAccessibleQuickWidget)
-+};
-+
-+class QAccessibleQuickWidgetOffscreenWindow: public QAccessibleQuickWindow
-+{
-+public:
-+    QAccessibleQuickWidgetOffscreenWindow(QQuickWindow *window);
-+    QAccessibleInterface *child(int index) const override;
-+    int childCount() const override;
-+    int indexOfChild(const QAccessibleInterface *iface) const override;
-+    QAccessibleInterface *childAt(int x, int y) const override;
-+};
-+
-+#endif // accessibility
-+
-+QT_END_NAMESPACE
-+
-+#endif
-diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory.cpp b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
-new file mode 100644
-index 0000000000..3756d0c27c
---- /dev/null
-+++ b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
-@@ -0,0 +1,60 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2021 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the QtQuick module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 3 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL3 included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 3 requirements
-+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 2.0 or (at your option) the GNU General
-+** Public license version 3 or any later version approved by the KDE Free
-+** Qt Foundation. The licenses are as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-+** included in the packaging of this file. Please review the following
-+** information to ensure the GNU General Public License requirements will
-+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-+** https://www.gnu.org/licenses/gpl-3.0.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "qaccessiblequickwidgetfactory_p.h"
-+#include "qaccessiblequickwidget.h"
-+
-+QT_BEGIN_NAMESPACE
-+
-+#if QT_CONFIG(accessibility)
-+
-+QAccessibleInterface *qAccessibleQuickWidgetFactory(const QString &classname, QObject *object)
-+{
-+    if (classname == QLatin1String("QQuickWidget")) {
-+        return new QAccessibleQuickWidget(qobject_cast(object));
-+    } else if (classname == QLatin1String("QQuickWidgetOffscreenWindow")) {
-+        return new QAccessibleQuickWidgetOffscreenWindow(qobject_cast(object));
-+    }
-+    return 0;
-+}
-+
-+#endif // accessibility
-+
-+QT_END_NAMESPACE
-+
-diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory_p.h b/src/quickwidgets/qaccessiblequickwidgetfactory_p.h
-new file mode 100644
-index 0000000000..8c63b09f81
---- /dev/null
-+++ b/src/quickwidgets/qaccessiblequickwidgetfactory_p.h
-@@ -0,0 +1,66 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2021 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the QtQuick module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 3 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL3 included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 3 requirements
-+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 2.0 or (at your option) the GNU General
-+** Public license version 3 or any later version approved by the KDE Free
-+** Qt Foundation. The licenses are as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-+** included in the packaging of this file. Please review the following
-+** information to ensure the GNU General Public License requirements will
-+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-+** https://www.gnu.org/licenses/gpl-3.0.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include 
-+
-+#ifndef QACCESSIBLEQUICKWIDGETFACTORY_H
-+#define QACCESSIBLEQUICKWIDGETFACTORY_H
-+
-+//
-+//  W A R N I N G
-+//  -------------
-+//
-+// This file is not part of the Qt API.  It exists purely as an
-+// implementation detail.  This header file may change from version to
-+// version without notice, or even be removed.
-+//
-+// We mean it.
-+//
-+
-+QT_BEGIN_NAMESPACE
-+
-+#if QT_CONFIG(accessibility)
-+
-+QAccessibleInterface *qAccessibleQuickWidgetFactory(const QString &classname, QObject *object);
-+
-+#endif
-+
-+QT_END_NAMESPACE
-+
-+#endif
-diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
-index 223d91f579..9c97b43518 100644
---- a/src/quickwidgets/qquickwidget.cpp
-+++ b/src/quickwidgets/qquickwidget.cpp
-@@ -39,6 +39,7 @@
- 
- #include "qquickwidget.h"
- #include "qquickwidget_p.h"
-+#include "qaccessiblequickwidgetfactory_p.h"
- 
- #include "private/qquickwindow_p.h"
- #include "private/qquickitem_p.h"
-@@ -75,9 +76,16 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+QQuickWidgetOffscreenWindow::QQuickWidgetOffscreenWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control)
-+:QQuickWindow(dd, control)
-+{
-+    setTitle(QString::fromLatin1("Offscreen"));
-+    setObjectName(QString::fromLatin1("QQuickOffScreenWindow"));
-+}
-+
- // override setVisble to prevent accidental offscreen window being created
- // by base class.
--class QQuickOffcreenWindowPrivate: public QQuickWindowPrivate {
-+class QQuickWidgetOffscreenWindowPrivate: public QQuickWindowPrivate {
- public:
-     void setVisible(bool visible) override {
-         Q_Q(QWindow);
-@@ -105,10 +113,8 @@ void QQuickWidgetPrivate::init(QQmlEngine* e)
-     Q_Q(QQuickWidget);
- 
-     renderControl = new QQuickWidgetRenderControl(q);
--    offscreenWindow = new QQuickWindow(*new QQuickOffcreenWindowPrivate(),renderControl);
-+    offscreenWindow = new QQuickWidgetOffscreenWindow(*new QQuickWidgetOffscreenWindowPrivate(), renderControl);
-     offscreenWindow->setScreen(q->screen());
--    offscreenWindow->setTitle(QString::fromLatin1("Offscreen"));
--    offscreenWindow->setObjectName(QString::fromLatin1("QQuickOffScreenWindow"));
-     // Do not call create() on offscreenWindow.
- 
-     // Check if the Software Adaptation is being used
-@@ -139,6 +145,10 @@ void QQuickWidgetPrivate::init(QQmlEngine* e)
-     QWidget::connect(offscreenWindow, &QQuickWindow::focusObjectChanged, q, &QQuickWidget::propagateFocusObjectChanged);
-     QObject::connect(renderControl, SIGNAL(renderRequested()), q, SLOT(triggerUpdate()));
-     QObject::connect(renderControl, SIGNAL(sceneChanged()), q, SLOT(triggerUpdate()));
-+
-+#if QT_CONFIG(accessibility)
-+    QAccessible::installFactory(&qAccessibleQuickWidgetFactory);
-+#endif
- }
- 
- void QQuickWidgetPrivate::ensureEngine() const
-diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h
-index 881f7f9220..1a946bcc71 100644
---- a/src/quickwidgets/qquickwidget_p.h
-+++ b/src/quickwidgets/qquickwidget_p.h
-@@ -148,6 +148,14 @@ public:
-     bool forceFullUpdate;
- };
- 
-+class QQuickWidgetOffscreenWindow: public QQuickWindow
-+{
-+    Q_OBJECT
-+
-+public:
-+    QQuickWidgetOffscreenWindow(QQuickWindowPrivate &dd, QQuickRenderControl *control);
-+};
-+
- QT_END_NAMESPACE
- 
- #endif // QQuickWidget_P_H
-diff --git a/src/quickwidgets/quickwidgets.pro b/src/quickwidgets/quickwidgets.pro
-index 2438e577ae..f46deb54ac 100644
---- a/src/quickwidgets/quickwidgets.pro
-+++ b/src/quickwidgets/quickwidgets.pro
-@@ -7,9 +7,13 @@ DEFINES   += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FO
- HEADERS += \
-     qquickwidget.h \
-     qquickwidget_p.h \
--    qtquickwidgetsglobal.h
-+    qtquickwidgetsglobal.h \
-+    qaccessiblequickwidget.h \
-+    qaccessiblequickwidgetfactory_p.h
- 
- SOURCES += \
--    qquickwidget.cpp
-+    qquickwidget.cpp \
-+    qaccessiblequickwidget.cpp \
-+    qaccessiblequickwidgetfactory.cpp
- 
- load(qt_module)
--- 
-2.39.0
-
diff --git a/0018-Send-ObjectShow-event-for-visible-components-after-i.patch b/0018-Send-ObjectShow-event-for-visible-components-after-i.patch
deleted file mode 100644
index 0709431..0000000
--- a/0018-Send-ObjectShow-event-for-visible-components-after-i.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 99c990d55802c1ea782ca609ccd2bcdf39fb786f Mon Sep 17 00:00:00 2001
-From: Fushan Wen 
-Date: Sat, 5 Nov 2022 01:44:30 +0800
-Subject: [PATCH 18/21] Send ObjectShow event for visible components after
- initialized
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Currently ObjectShow event is only sent when the visible property
-changes from false to true, but for items with the notification
-accessible role, a screen reader like Orca needs to receive an
-ObjectShow event to read the notification, so also send the event after
-a component is initialized.
-
-See also: https://gitlab.gnome.org/GNOME/orca/-/merge_requests/134
-
-Pick-to: 6.4
-Change-Id: I626594b65ffe4d0582dcee9f489df0c2c63e53b7
-Reviewed-by: Jan Arve Sæther 
-(cherry picked from commit 9a4f2d23ecec2c7ff19f83cff28df6b97e3fda98)
----
- src/quick/items/qquickitem.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index 9de244ed9e..462147adbd 100644
---- a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -5125,6 +5125,13 @@ void QQuickItem::componentComplete()
-         d->addToDirtyList();
-         QQuickWindowPrivate::get(d->window)->dirtyItem(this);
-     }
-+
-+#if QT_CONFIG(accessibility)
-+    if (d->isAccessible && d->effectiveVisible) {
-+        QAccessibleEvent ev(this, QAccessible::ObjectShow);
-+        QAccessible::updateAccessibility(&ev);
-+    }
-+#endif
- }
- 
- QQuickStateGroup *QQuickItemPrivate::_states()
--- 
-2.39.0
-
diff --git a/0019-QQuickItem-avoid-emitting-signals-during-destruction.patch b/0019-QQuickItem-avoid-emitting-signals-during-destruction.patch
deleted file mode 100644
index 00e9eaa..0000000
--- a/0019-QQuickItem-avoid-emitting-signals-during-destruction.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From b91f07532b02f68161ec525bd44501d91ad19b38 Mon Sep 17 00:00:00 2001
-From: Volker Hilsheimer 
-Date: Wed, 9 Nov 2022 15:34:11 +0100
-Subject: [PATCH 19/21] QQuickItem: avoid emitting signals during destruction
-
-If a QQuickItem is in the QQuickItem destructor, then it is both unsafe
-and unnecessary to emit property change notifications. Connected code
-can no longer rely on the state of the emitting object - if it was
-originally a subclass of QQuickItem, then those subclass destructors
-will already have run. And the QQuickItem destructor will also have
-partially run, leaving the object in an undefined state.
-
-Add a flag that we set to true at the top of ~QQuickItem, and don't emit
-visibleChildrenChanged, parentChanged, visibleChanged, and
-childrenChanged for items that are partially destroyed already.
-
-[ChangeLog][Qt Quick][QQuickItem] QQuickItem no longer emits change
-notifications for the parent, children, visible, and visibleChildren
-properties while it is being destroyed.
-
-Task-number: QTBUG-107850
-Change-Id: I36ea98842c89ad89fcc1c4a328d138f66f2a0446
-Reviewed-by: Shawn Rutledge 
-Reviewed-by: Mitch Curtis 
-(cherry picked from commit 74873324bdf3399753f9fcaf7461c0e00df628b1)
----
- src/quick/items/qquickitem.cpp | 21 +++++++++++++--------
- src/quick/items/qquickitem_p.h |  1 +
- 2 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index 462147adbd..4cf73ff73d 100644
---- a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -2327,6 +2327,7 @@ QQuickItem::QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent)
- QQuickItem::~QQuickItem()
- {
-     Q_D(QQuickItem);
-+    d->inDestructor = true;
- 
-     if (d->windowRefCount > 1)
-         d->windowRefCount = 1; // Make sure window is set to null in next call to derefWindow().
-@@ -2694,9 +2695,8 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
- 
-         const bool wasVisible = isVisible();
-         op->removeChild(this);
--        if (wasVisible) {
-+        if (wasVisible && !op->inDestructor)
-             emit oldParentItem->visibleChildrenChanged();
--        }
-     } else if (d->window) {
-         QQuickWindowPrivate::get(d->window)->parentlessItems.remove(this);
-     }
-@@ -2773,8 +2773,9 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
- 
-     d->itemChange(ItemParentHasChanged, d->parentItem);
- 
--    emit parentChanged(d->parentItem);
--    if (isVisible() && d->parentItem)
-+    if (!d->inDestructor)
-+        emit parentChanged(d->parentItem);
-+    if (isVisible() && d->parentItem && !QQuickItemPrivate::get(d->parentItem)->inDestructor)
-         emit d->parentItem->visibleChildrenChanged();
- }
- 
-@@ -2970,7 +2971,8 @@ void QQuickItemPrivate::removeChild(QQuickItem *child)
- 
-     itemChange(QQuickItem::ItemChildRemovedChange, child);
- 
--    emit q->childrenChanged();
-+    if (!inDestructor)
-+        emit q->childrenChanged();
- }
- 
- void QQuickItemPrivate::refWindow(QQuickWindow *c)
-@@ -3199,6 +3201,7 @@ QQuickItemPrivate::QQuickItemPrivate()
-     , touchEnabled(false)
- #endif
-     , hasCursorHandler(false)
-+    , inDestructor(false)
-     , dirtyAttributes(0)
-     , nextDirtyItem(nullptr)
-     , prevDirtyItem(nullptr)
-@@ -6118,9 +6121,11 @@ bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)
-         QAccessible::updateAccessibility(&ev);
-     }
- #endif
--    emit q->visibleChanged();
--    if (childVisibilityChanged)
--        emit q->visibleChildrenChanged();
-+    if (!inDestructor) {
-+        emit q->visibleChanged();
-+        if (childVisibilityChanged)
-+            emit q->visibleChildrenChanged();
-+    }
- 
-     return true;    // effective visibility DID change
- }
-diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
-index 841d91bb40..ade8fb61f2 100644
---- a/src/quick/items/qquickitem_p.h
-+++ b/src/quick/items/qquickitem_p.h
-@@ -472,6 +472,7 @@ public:
-     bool replayingPressEvent:1;
-     bool touchEnabled:1;
-     bool hasCursorHandler:1;
-+    quint32 inDestructor:1; // has entered ~QQuickItem
- 
-     enum DirtyType {
-         TransformOrigin         = 0x00000001,
--- 
-2.39.0
-
diff --git a/0020-a11y-track-item-enabled-state.patch b/0020-a11y-track-item-enabled-state.patch
deleted file mode 100644
index 817fdc5..0000000
--- a/0020-a11y-track-item-enabled-state.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 1fb12800a8907680b821a8e8e29c5b428cbb64b6 Mon Sep 17 00:00:00 2001
-From: Harald Sitter 
-Date: Mon, 28 Nov 2022 14:59:33 +0100
-Subject: [PATCH 20/21] a11y: track item enabled state
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-disabled items are neither enabled nor focusable
-
-Change-Id: I4f286c7b85605d5ad6fa787d1f5cfcce1297d268
-Reviewed-by: Volker Hilsheimer 
-Reviewed-by: Jan Arve Sæther 
-(cherry picked from commit 20fd2902a6d7bdb4a3306005d2718ca5a8fef96d)
----
- src/quick/accessible/qaccessiblequickitem.cpp | 4 ++++
- src/quick/items/qquickitem.cpp                | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
-index eb3df4d4cd..78e2ab302c 100644
---- a/src/quick/accessible/qaccessiblequickitem.cpp
-+++ b/src/quick/accessible/qaccessiblequickitem.cpp
-@@ -210,6 +210,10 @@ QAccessible::State QAccessibleQuickItem::state() const
-     if (role() == QAccessible::EditableText)
-         if (auto ti = qobject_cast(item()))
-             state.passwordEdit = ti->echoMode() != QQuickTextInput::Normal;
-+    if (!item()->isEnabled()) {
-+        state.focusable = false;
-+        state.disabled = true;
-+    }
-     return state;
- }
- 
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index 4cf73ff73d..dec0ae19ae 100644
---- a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -6174,6 +6174,15 @@ void QQuickItemPrivate::setEffectiveEnableRecur(QQuickItem *scope, bool newEffec
-     }
- 
-     itemChange(QQuickItem::ItemEnabledHasChanged, effectiveEnable);
-+#if QT_CONFIG(accessibility)
-+    if (isAccessible) {
-+        QAccessible::State changedState;
-+        changedState.disabled = true;
-+        changedState.focusable = true;
-+        QAccessibleStateChangeEvent ev(q, changedState);
-+        QAccessible::updateAccessibility(&ev);
-+    }
-+#endif
-     emit q->enabledChanged();
- }
- 
--- 
-2.39.0
-
diff --git a/0021-Make-QaccessibleQuickWidget-private-API.patch b/0021-Make-QaccessibleQuickWidget-private-API.patch
deleted file mode 100644
index 2054f05..0000000
--- a/0021-Make-QaccessibleQuickWidget-private-API.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 8defe7bfcae2ac5cb6dc25bfe3678124b09cf6f9 Mon Sep 17 00:00:00 2001
-From: Fabian Kosmale 
-Date: Tue, 1 Jun 2021 16:40:44 +0200
-Subject: [PATCH 21/21] Make QaccessibleQuickWidget private API
-
-Its base class is private API, so it should be private API, too.
-
-Change-Id: Ic80f841fee19ed0305c60ad5f8e9349a05f09e5e
-Reviewed-by: Alexandru Croitor 
-Reviewed-by: Ulf Hermann 
-Reviewed-by: Qt CI Bot 
-(cherry picked from commit a4fa74d3e7581cb5c6bb82223ee17257f66fa41d)
----
- src/quickwidgets/qaccessiblequickwidget.cpp           |  2 +-
- ...ssiblequickwidget.h => qaccessiblequickwidget_p.h} | 11 +++++++++++
- src/quickwidgets/qaccessiblequickwidgetfactory.cpp    |  2 +-
- src/quickwidgets/quickwidgets.pro                     |  2 +-
- 4 files changed, 14 insertions(+), 3 deletions(-)
- rename src/quickwidgets/{qaccessiblequickwidget.h => qaccessiblequickwidget_p.h} (92%)
-
-diff --git a/src/quickwidgets/qaccessiblequickwidget.cpp b/src/quickwidgets/qaccessiblequickwidget.cpp
-index 6f04d6693f..8a1c901880 100644
---- a/src/quickwidgets/qaccessiblequickwidget.cpp
-+++ b/src/quickwidgets/qaccessiblequickwidget.cpp
-@@ -37,7 +37,7 @@
- **
- ****************************************************************************/
- 
--#include "qaccessiblequickwidget.h"
-+#include "qaccessiblequickwidget_p.h"
- 
- #include "qquickwidget_p.h"
- 
-diff --git a/src/quickwidgets/qaccessiblequickwidget.h b/src/quickwidgets/qaccessiblequickwidget_p.h
-similarity index 92%
-rename from src/quickwidgets/qaccessiblequickwidget.h
-rename to src/quickwidgets/qaccessiblequickwidget_p.h
-index 1f52c78c46..7c2ab930e0 100644
---- a/src/quickwidgets/qaccessiblequickwidget.h
-+++ b/src/quickwidgets/qaccessiblequickwidget_p.h
-@@ -40,6 +40,17 @@
- #ifndef QACCESSIBLEQUICKWIDGET_H
- #define QACCESSIBLEQUICKWIDGET_H
- 
-+//
-+//  W A R N I N G
-+//  -------------
-+//
-+// This file is not part of the Qt API.  It exists purely as an
-+// implementation detail.  This header file may change from version to
-+// version without notice, or even be removed.
-+//
-+// We mean it.
-+//
-+
- #include "qquickwidget.h"
- #include 
- 
-diff --git a/src/quickwidgets/qaccessiblequickwidgetfactory.cpp b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
-index 3756d0c27c..7ba88a1769 100644
---- a/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
-+++ b/src/quickwidgets/qaccessiblequickwidgetfactory.cpp
-@@ -38,7 +38,7 @@
- ****************************************************************************/
- 
- #include "qaccessiblequickwidgetfactory_p.h"
--#include "qaccessiblequickwidget.h"
-+#include "qaccessiblequickwidget_p.h"
- 
- QT_BEGIN_NAMESPACE
- 
-diff --git a/src/quickwidgets/quickwidgets.pro b/src/quickwidgets/quickwidgets.pro
-index f46deb54ac..85d156b8a3 100644
---- a/src/quickwidgets/quickwidgets.pro
-+++ b/src/quickwidgets/quickwidgets.pro
-@@ -8,7 +8,7 @@ HEADERS += \
-     qquickwidget.h \
-     qquickwidget_p.h \
-     qtquickwidgetsglobal.h \
--    qaccessiblequickwidget.h \
-+    qaccessiblequickwidget_p.h \
-     qaccessiblequickwidgetfactory_p.h
- 
- SOURCES += \
--- 
-2.39.0
-
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 2e9baee..ce3f88a 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -11,8 +11,8 @@
 
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
-Version: 5.15.8
-Release: 4%{?dist}
+Version: 5.15.9
+Release: 1%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -27,28 +27,26 @@ Source5: qv4global_p-multilib.h
 ## upstream patches
 ## repo: https://invent.kde.org/qt/qt/qtdeclarative
 ## branch: kde/5.15
-## git format-patch v5.15.8-lts-lgpl
-Patch1:  0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch
-Patch2:  0002-Support-apos-in-styled-text.patch
-Patch3:  0003-Remove-unused-QPointer-QQuickPointerMask.patch
-Patch4:  0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch
-Patch5:  0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch
-Patch6:  0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch
-Patch7:  0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch
-Patch8:  0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch
-Patch9:  0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch
-Patch10: 0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch
-Patch11: 0011-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch
-Patch12: 0012-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch
-Patch13: 0013-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch
-Patch14: 0014-Reset-currentChanges-if-currentChanges-is-active-whe.patch
-Patch15: 0015-Don-t-convert-QByteArray-in-startDrag.patch
-Patch16: 0016-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch
-Patch17: 0017-Implement-accessibility-for-QQuickWidget.patch
-Patch18: 0018-Send-ObjectShow-event-for-visible-components-after-i.patch
-Patch19: 0019-QQuickItem-avoid-emitting-signals-during-destruction.patch
-Patch20: 0020-a11y-track-item-enabled-state.patch
-Patch21: 0021-Make-QaccessibleQuickWidget-private-API.patch
+## git format-patch v5.15.9-lts-lgpl
+Patch1:  0001-Remove-unused-QPointer-QQuickPointerMask.patch
+Patch2:  0002-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch
+Patch3:  0003-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch
+Patch4:  0004-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch
+Patch5:  0005-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch
+Patch6:  0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch
+Patch7:  0007-Don-t-convert-QByteArray-in-startDrag.patch
+Patch8:  0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch
+Patch9:  0009-Implement-accessibility-for-QQuickWidget.patch
+Patch10: 0010-Send-ObjectShow-event-for-visible-components-after-i.patch
+Patch11: 0011-QQuickItem-avoid-emitting-signals-during-destruction.patch
+Patch12: 0012-a11y-track-item-enabled-state.patch
+Patch13: 0013-Make-QaccessibleQuickWidget-private-API.patch
+Patch14: 0014-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch
+Patch15: 0015-Fix-missing-glyphs-when-using-NativeRendering.patch
+Patch16: 0016-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch
+Patch17: 0017-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch
+Patch18: 0018-QQuickState-when-handle-QJSValue-properties-correctl.patch
+Patch19: 0019-Models-Avoid-crashes-when-deleting-cache-items.patch
 
 
 ## upstreamable patches
@@ -235,6 +233,9 @@ make check -k -C tests ||:
 
 
 %changelog
+* Tue Apr 11 2023 Jan Grulich  - 5.15.9-1
+- 5.15.9
+
 * Wed Mar 15 2023 Neal Gompa  - 5.15.8-4
 - Backport fix for crashes in V4 JIT (#2177696)
 
diff --git a/sources b/sources
index 7049741..f47312c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (qtdeclarative-everywhere-opensource-src-5.15.6.tar.xz) = a4824b6ec2de5e78819b726850767db6d4280208d6cc985219f4c33b6b0dcd6194557f32b577df97b0596d157190aa9c00e99bf6879554936a356fa7afe8a7d5
-SHA512 (qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz) = c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73
+SHA512 (qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz) = ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7