From 25086274d7ece63008c95f676c1559ade8543b66 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:06:32 +0100 Subject: [PATCH] update to 5.15.7 [release 5.15.7-1mamba;Mon Nov 07 2022] --- ...yledText-also-supports-nbsp-and-quot.patch | 8 +- ... => 0002-Support-apos-in-styled-text.patch | 8 +- ...ve-unused-QPointer-QQuickPointerMask.patch | 6 +- ...l-Refresh-the-view-when-a-column-is-.patch | 50 +- ...or-tainted-QObject-JavaScript-wrappe.patch | 6 +- ...show-correct-usage-of-setInitialProp.patch | 51 -- ...-Check-if-QQuickItem-was-not-deleted.patch | 43 -- ...ossible-crash-in-QSGDefaultLayer-gra.patch | 6 +- ...-to-optimize-away-QML-type-registrat.patch | 271 ---------- ...-so-that-it-actually-registers-a-tap.patch | 73 +++ ...t-reset-lineCount-when-text-is-empty.patch | 83 --- ...ndler-so-that-it-actually-registers-.patch | 61 +++ ...-INCLUDEPATH-must-be-set-in-some-cas.patch | 38 -- ...Array-fix-UB-precondition-violation-.patch | 36 ++ ...dtor-of-an-object-we-continue-to-use.patch | 51 ++ ...doc-Add-clarification-to-QML_FOREIGN.patch | 47 -- ...operty-cache-leaks-of-delegate-items.patch | 214 -------- ...Widget-and-its-offscreen-window-s-sc.patch | 84 +++ ...-against-cycles-in-nextPrevItemInTab.patch | 122 +++++ ...ut-Store-mask-data-in-std-unique_ptr.patch | 66 --- ...alling-hasOwnProperty-on-proxy-objec.patch | 100 ---- ...eFieldGlyphCache-fix-multiplication-.patch | 43 ++ ...ent-is-sent-on-item-s-geometry-chang.patch | 44 -- ...eFieldGlyphCache-fix-UB-ordering-of-.patch | 68 +++ ...Flickable-wheel-velocity-calculation.patch | 423 +++++++++++++++ ...e-abi-into-account-for-_metatypes.js.patch | 36 -- ...kable-with-QTBUG-56075-patch-applied.patch | 25 + ...x-bounded-signal-expressions-when-de.patch | 68 --- ...nges-if-currentChanges-is-active-whe.patch | 38 ++ 0017-Use-load-qt_tool-for-qmltime.patch | 32 -- ...iew.isCurrentItem-when-used-with-Del.patch | 94 ++++ ...el-Fix-crash-when-modelCache-is-null.patch | 71 --- ...-even-if-the-syncView-has-an-empty-m.patch | 101 ---- ...Don-t-skip-already-inspected-objects.patch | 58 --- 0021-QML-Fix-proxy-iteration.patch | 114 ----- 0022-Fix-IC-properties-in-same-file.patch | 146 ------ ...memory-writable-include-the-exceptio.patch | 201 -------- ...em-event-delivery-handlers-setAccept.patch | 103 ---- ...hen-StyledText-encounters-a-non-supp.patch | 39 -- ...its-include-to-fix-build-with-GCC-11.patch | 33 -- ...s-in-Yarr.h-to-fix-build-with-GCC-11.patch | 43 -- ...not-incubate-if-the-source-arrives-a.patch | 112 ---- ...ext-with-subpixel-matrix-translation.patch | 483 ------------------ ...revert-properties-of-deleted-objects.patch | 192 ------- qt5-qtdeclarative.spec | 96 ++-- 45 files changed, 1182 insertions(+), 2905 deletions(-) rename 0027-Document-that-StyledText-also-supports-nbsp-and-quot.patch => 0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch (84%) rename 0028-Support-apos-in-styled-text.patch => 0002-Support-apos-in-styled-text.patch (91%) rename 0029-Remove-unused-QPointer-QQuickPointerMask.patch => 0003-Remove-unused-QPointer-QQuickPointerMask.patch (88%) rename 0032-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch => 0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch (83%) rename 0033-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch => 0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch (97%) delete mode 100644 0005-QQuickView-docs-show-correct-usage-of-setInitialProp.patch delete mode 100644 0006-QQuickWindow-Check-if-QQuickItem-was-not-deleted.patch rename 0035-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch => 0006-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch (95%) delete mode 100644 0007-Avoid-GHS-linker-to-optimize-away-QML-type-registrat.patch create mode 100644 0007-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch delete mode 100644 0008-QML-Text-doesn-t-reset-lineCount-when-text-is-empty.patch create mode 100644 0008-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch delete mode 100644 0009-Doc-mention-that-INCLUDEPATH-must-be-set-in-some-cas.patch create mode 100644 0009-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch create mode 100644 0010-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch delete mode 100644 0010-qmlfunctions.qdoc-Add-clarification-to-QML_FOREIGN.patch delete mode 100644 0011-Fix-QML-property-cache-leaks-of-delegate-items.patch create mode 100644 0011-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch create mode 100644 0012-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch delete mode 100644 0012-QQuickTextInput-Store-mask-data-in-std-unique_ptr.patch delete mode 100644 0013-Fix-crash-when-calling-hasOwnProperty-on-proxy-objec.patch create mode 100644 0013-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch delete mode 100644 0014-Accessibility-event-is-sent-on-item-s-geometry-chang.patch create mode 100644 0014-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch create mode 100644 0015-Fix-Flickable-wheel-velocity-calculation.patch delete mode 100644 0015-qmltypes.prf-Take-abi-into-account-for-_metatypes.js.patch create mode 100644 0016-Fix-Flickable-with-QTBUG-56075-patch-applied.patch delete mode 100644 0016-qv4qmlcontext-Fix-bounded-signal-expressions-when-de.patch create mode 100644 0017-Reset-currentChanges-if-currentChanges-is-active-whe.patch delete mode 100644 0017-Use-load-qt_tool-for-qmltime.patch create mode 100644 0018-Revert-Fix-ListView.isCurrentItem-when-used-with-Del.patch delete mode 100644 0018-qqmlistmodel-Fix-crash-when-modelCache-is-null.patch delete mode 100644 0019-Show-a-tableview-even-if-the-syncView-has-an-empty-m.patch delete mode 100644 0020-DesignerSupport-Don-t-skip-already-inspected-objects.patch delete mode 100644 0021-QML-Fix-proxy-iteration.patch delete mode 100644 0022-Fix-IC-properties-in-same-file.patch delete mode 100644 0023-JIT-When-making-memory-writable-include-the-exceptio.patch delete mode 100644 0024-doc-explain-QQItem-event-delivery-handlers-setAccept.patch delete mode 100644 0025-Give-a-warning-when-StyledText-encounters-a-non-supp.patch delete mode 100644 0026-Add-missing-limits-include-to-fix-build-with-GCC-11.patch delete mode 100644 0030-Include-limits-in-Yarr.h-to-fix-build-with-GCC-11.patch delete mode 100644 0031-QQuickLoader-Do-not-incubate-if-the-source-arrives-a.patch delete mode 100644 0034-Fix-distorted-text-with-subpixel-matrix-translation.patch delete mode 100644 0036-Do-not-revert-properties-of-deleted-objects.patch diff --git a/0027-Document-that-StyledText-also-supports-nbsp-and-quot.patch b/0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch similarity index 84% rename from 0027-Document-that-StyledText-also-supports-nbsp-and-quot.patch rename to 0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch index fc07026..b4b0970 100644 --- a/0027-Document-that-StyledText-also-supports-nbsp-and-quot.patch +++ b/0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch @@ -1,7 +1,7 @@ -From ebc0daeea59af400601e6207cd9939c746fccdc7 Mon Sep 17 00:00:00 2001 +From 43b6267d024afd655a8c0c8c833f71850d7a8bb9 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 21 May 2021 13:17:15 +0200 -Subject: [PATCH 27/28] Document that StyledText also supports   and +Subject: [PATCH 01/18] Document that StyledText also supports   and " Change-Id: I1715f8ae8ec8d0fbaf6dbe2b8663cc169da663cd @@ -12,7 +12,7 @@ Reviewed-by: Fabian Kosmale 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp -index 581ab9f76a..26840b99e3 100644 +index 6230186933..c1571fc6f5 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount() @@ -25,5 +25,5 @@ index 581ab9f76a..26840b99e3 100644 \c Text.StyledText parser is strict, requiring tags to be correctly nested. -- -2.31.1 +2.37.3 diff --git a/0028-Support-apos-in-styled-text.patch b/0002-Support-apos-in-styled-text.patch similarity index 91% rename from 0028-Support-apos-in-styled-text.patch rename to 0002-Support-apos-in-styled-text.patch index b857b04..9715951 100644 --- a/0028-Support-apos-in-styled-text.patch +++ b/0002-Support-apos-in-styled-text.patch @@ -1,7 +1,7 @@ -From 0dda47d9f1a22567ad8f1266be2f0cd8a9226c7f Mon Sep 17 00:00:00 2001 +From 8e28af8076873503bbf036487aaf7310407a2f11 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 21 May 2021 13:42:35 +0200 -Subject: [PATCH 28/28] Support ' in styled text +Subject: [PATCH 02/18] Support ' in styled text Pick-to: 6.1 5.15 Change-Id: I4a8db963e52a7899ab1796f9a560e8029cc1c929 @@ -14,7 +14,7 @@ Reviewed-by: Eskil Abrahamsen Blomfeldt 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp -index 26840b99e3..4ddd2a41bc 100644 +index c1571fc6f5..e823ca1095 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount() @@ -40,5 +40,5 @@ index d531fc9205..a25af90414 100644 textOut += QChar(34); else if (entity == QLatin1String("nbsp")) -- -2.31.1 +2.37.3 diff --git a/0029-Remove-unused-QPointer-QQuickPointerMask.patch b/0003-Remove-unused-QPointer-QQuickPointerMask.patch similarity index 88% rename from 0029-Remove-unused-QPointer-QQuickPointerMask.patch rename to 0003-Remove-unused-QPointer-QQuickPointerMask.patch index a3f429f..fdb521f 100644 --- a/0029-Remove-unused-QPointer-QQuickPointerMask.patch +++ b/0003-Remove-unused-QPointer-QQuickPointerMask.patch @@ -1,7 +1,7 @@ -From 6683c414c5cc6ab46197c41bb1361c518ca84d3e Mon Sep 17 00:00:00 2001 +From 0f3b328766038c1161f4f613a0bf3a4fcbdb4cef Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 17 Jun 2021 16:32:28 +0200 -Subject: [PATCH 29/29] Remove unused QPointer +Subject: [PATCH 03/18] Remove unused QPointer Change-Id: I009fa6bbd8599dc3bb2e810176fe20e70ed50851 Reviewed-by: Shawn Rutledge @@ -31,5 +31,5 @@ index fba383e268..0d63618622 100644 QPointF targetStartPos; QPointF lastPos; -- -2.31.1 +2.37.3 diff --git a/0032-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch b/0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch similarity index 83% rename from 0032-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch rename to 0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch index 152a8ad..afdc492 100644 --- a/0032-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch +++ b/0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch @@ -1,7 +1,7 @@ -From e0271324f05fee2c8670a73d1e7e89aef51532a3 Mon Sep 17 00:00:00 2001 +From ad09b853a3a137127de847d4d6d55f73ab09899d Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 23 Sep 2021 03:43:04 +0200 -Subject: [PATCH 32/36] QQmlDelegateModel: Refresh the view when a column is +Subject: [PATCH 04/18] 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 @@ -17,13 +17,12 @@ Signed-off-by: Aleix Pol src/qmlmodels/qqmldelegatemodel.cpp | 44 +++++++++++++++++++ src/qmlmodels/qqmldelegatemodel_p.h | 3 ++ .../data/redrawUponColumnChange.qml | 11 +++++ - .../qqmldelegatemodel/qqmldelegatemodel.pro | 2 +- - .../tst_qqmldelegatemodel.cpp | 29 ++++++++++++ - 5 files changed, 88 insertions(+), 1 deletion(-) + .../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 12c3d11937..8ce3da1cf1 100644 +index 2079a8ed04..a577cb2351 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -389,6 +389,12 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel() @@ -52,7 +51,7 @@ index 12c3d11937..8ce3da1cf1 100644 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)), -@@ -1953,6 +1965,38 @@ void QQmlDelegateModel::_q_rowsMoved( +@@ -1973,6 +1985,38 @@ void QQmlDelegateModel::_q_rowsMoved( } } @@ -122,24 +121,11 @@ index 0000000000..206133bb39 + text: display + } +} -diff --git a/tests/auto/qml/qqmldelegatemodel/qqmldelegatemodel.pro b/tests/auto/qml/qqmldelegatemodel/qqmldelegatemodel.pro -index 7fdd3ab5f1..fbd72f6a44 100644 ---- a/tests/auto/qml/qqmldelegatemodel/qqmldelegatemodel.pro -+++ b/tests/auto/qml/qqmldelegatemodel/qqmldelegatemodel.pro -@@ -2,7 +2,7 @@ CONFIG += testcase - TARGET = tst_qqmldelegatemodel - macos:CONFIG -= app_bundle - --QT += qml testlib core-private qml-private qmlmodels-private -+QT += qml quick testlib core-private qml-private qmlmodels-private - - SOURCES += tst_qqmldelegatemodel.cpp - diff --git a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp -index 87f42c0c8a..1d338ac330 100644 +index 35f1e2c94d..1722447830 100644 --- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp +++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp -@@ -27,8 +27,12 @@ +@@ -27,6 +27,8 @@ ****************************************************************************/ #include @@ -147,21 +133,17 @@ index 87f42c0c8a..1d338ac330 100644 +#include #include #include -+#include -+#include - - #include "../../shared/util.h" - -@@ -42,6 +46,7 @@ public: - private slots: - void valueWithoutCallingObjectFirst_data(); - void valueWithoutCallingObjectFirst(); + #include +@@ -47,6 +49,7 @@ private slots: + void filterOnGroup_removeWhenCompleted(); + void qtbug_86017(); + void contextAccessedByHandler(); + void redrawUponColumnChange(); }; class AbstractItemModel : public QAbstractItemModel -@@ -134,6 +139,30 @@ void tst_QQmlDelegateModel::valueWithoutCallingObjectFirst() - QCOMPARE(model->variantValue(index, role), expectedValue); +@@ -186,6 +189,30 @@ void tst_QQmlDelegateModel::contextAccessedByHandler() + QVERIFY(root->property("works").toBool()); } +void tst_QQmlDelegateModel::redrawUponColumnChange() @@ -192,5 +174,5 @@ index 87f42c0c8a..1d338ac330 100644 #include "tst_qqmldelegatemodel.moc" -- -2.31.1 +2.37.3 diff --git a/0033-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch b/0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch similarity index 97% rename from 0033-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch rename to 0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch index 7bb1b63..7242c29 100644 --- a/0033-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch +++ b/0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch @@ -1,7 +1,7 @@ -From 9c0030bc8e828ecfbd8a4c8dd6bbfcbd3655b71c Mon Sep 17 00:00:00 2001 +From 55caf921033dc1f310c1d370a046908cb0a6bc57 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sun, 10 Oct 2021 21:04:21 +0300 -Subject: [PATCH 33/36] Fix sweep step for tainted QObject JavaScript wrappers +Subject: [PATCH 05/18] Fix sweep step for tainted QObject JavaScript wrappers Currently, whenever the garbage collector runs, it will destroy all valid tainted wrappers. @@ -115,5 +115,5 @@ index 5d635aa63b..824fd89e5b 100644 // engine2 doesn't own the object as engine1 was the first to wrap it above. // Therefore, no effect here. -- -2.31.1 +2.37.3 diff --git a/0005-QQuickView-docs-show-correct-usage-of-setInitialProp.patch b/0005-QQuickView-docs-show-correct-usage-of-setInitialProp.patch deleted file mode 100644 index efb698e..0000000 --- a/0005-QQuickView-docs-show-correct-usage-of-setInitialProp.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4ee1462686dc12eb463f5ba6b378d43a39aed074 Mon Sep 17 00:00:00 2001 -From: Fabian Kosmale -Date: Thu, 12 Nov 2020 12:11:29 +0100 -Subject: [PATCH 05/28] QQuickView docs: show correct usage of - setInitialProperties - -Change-Id: If63f4c59f18bc0754ce2e68e424f6efd0f512d30 -Reviewed-by: Mitch Curtis -(cherry picked from commit 54d4f8f526f9c9a1af702b14925e1d34ee8b2134) -Reviewed-by: Qt Cherry-pick Bot ---- - src/quick/doc/snippets/qquickview-ex.cpp | 9 +++++++++ - src/quick/items/qquickview.cpp | 4 ++++ - 2 files changed, 13 insertions(+) - -diff --git a/src/quick/doc/snippets/qquickview-ex.cpp b/src/quick/doc/snippets/qquickview-ex.cpp -index 32406f8f2f..5f93dfdbe8 100644 ---- a/src/quick/doc/snippets/qquickview-ex.cpp -+++ b/src/quick/doc/snippets/qquickview-ex.cpp -@@ -59,3 +59,12 @@ int main(int argc, char *argv[]) - return app.exec(); - } - //![0] -+ -+void makeDocTeamHappyByKeepingExampleCompilable() { -+//![1] -+ QScopedPointer view { new QQuickView }; -+ view->setInitialProperties({"x, 100"}, {"width", 50}); -+ view->setSource(QUrl::fromLocalFile("myqmlfile.qml")); -+ view->show(); -+//![1] -+} -diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp -index 97f6689d8a..b3a5270e9b 100644 ---- a/src/quick/items/qquickview.cpp -+++ b/src/quick/items/qquickview.cpp -@@ -240,7 +240,11 @@ void QQuickView::setSource(const QUrl& url) - Sets the initial properties \a initialProperties with which the QML - component gets initialized after calling \l QQuickView::setSource(). - -+ \snippet qquickview-ex.cpp 1 -+ - \note You can only use this function to initialize top-level properties. -+ \note This function should always be called before setSource, as it has -+ no effect once the component has become \c Ready. - - \sa QQmlComponent::createWithInitialProperties() - \since 5.14 --- -2.31.1 - diff --git a/0006-QQuickWindow-Check-if-QQuickItem-was-not-deleted.patch b/0006-QQuickWindow-Check-if-QQuickItem-was-not-deleted.patch deleted file mode 100644 index 4e78c64..0000000 --- a/0006-QQuickWindow-Check-if-QQuickItem-was-not-deleted.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81238e0ff8453f4fb78436ac9bec8452584680ae Mon Sep 17 00:00:00 2001 -From: Bartlomiej Moskal -Date: Thu, 5 Nov 2020 10:12:29 +0100 -Subject: [PATCH 06/28] QQuickWindow: Check if QQuickItem was not deleted - -Added check into deliverMatchingPointsToItem method for Android device. - -In QT_VERSION below 6.0.0 touchEnabled for QtQuickItems is set by default to true -It causes delivering touch events to Items which are not interested -In some cases it may cause a crash. For example using Material Style in Android. -QQuickShaderEffectSource may be deleted and then try to handle touch - -Fixes: QTBUG-85379 -Change-Id: Ia2c4e016db57ef9c86fcc31d4cfba6154068a546 -Reviewed-by: Shawn Rutledge -(cherry picked from commit a14e4fcdf94d26774490b26a4ef77981594f583f) -Reviewed-by: Bartlomiej Moskal ---- - src/quick/items/qquickwindow.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp -index d0c9ad5454..9ff91eb9a0 100644 ---- a/src/quick/items/qquickwindow.cpp -+++ b/src/quick/items/qquickwindow.cpp -@@ -2864,6 +2864,14 @@ void QQuickWindowPrivate::deliverMatchingPointsToItem(QQuickItem *item, QQuickPo - { - Q_Q(QQuickWindow); - QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); -+#if defined(Q_OS_ANDROID) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -+ // QTBUG-85379 -+ // In QT_VERSION below 6.0.0 touchEnabled for QtQuickItems is set by default to true -+ // It causes delivering touch events to Items which are not interested -+ // In some cases (like using Material Style in Android) it may cause a crash -+ if (itemPrivate->wasDeleted) -+ return; -+#endif - pointerEvent->localize(item); - - // Let the Item's handlers (if any) have the event first. --- -2.31.1 - diff --git a/0035-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch b/0006-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch similarity index 95% rename from 0035-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch rename to 0006-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch index d8cc7b1..24de445 100644 --- a/0035-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch +++ b/0006-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch @@ -1,7 +1,7 @@ -From 9dde7b66a30a33074fc2c2c682b53b18791dba0d Mon Sep 17 00:00:00 2001 +From 1cb0de43684c7f23cd121d48ebd84a9da688c8ef Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 11 Oct 2021 15:37:33 +0200 -Subject: [PATCH 35/36] Revert "Fix for possible crash in +Subject: [PATCH 06/18] Revert "Fix for possible crash in QSGDefaultLayer::grab" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -67,5 +67,5 @@ index 4deb6c70a3..c0a1ccab78 100644 protected: void releaseResources() override; -- -2.31.1 +2.37.3 diff --git a/0007-Avoid-GHS-linker-to-optimize-away-QML-type-registrat.patch b/0007-Avoid-GHS-linker-to-optimize-away-QML-type-registrat.patch deleted file mode 100644 index 46c899a..0000000 --- a/0007-Avoid-GHS-linker-to-optimize-away-QML-type-registrat.patch +++ /dev/null @@ -1,271 +0,0 @@ -From e749605ecbe76c392552d0e3a75f47b31bed9ba1 Mon Sep 17 00:00:00 2001 -From: Kimmo Ollila -Date: Wed, 11 Nov 2020 12:23:53 +0200 -Subject: [PATCH 07/28] Avoid GHS linker to optimize away QML type - registrations - -GHS linker optimizes away QML type registrations despite volatile. -To prevent this we add #pragma ghs reference(s) to avoid such linker -optimization. - -Fixes: QTBUG-88033 -Change-Id: I7c8983506360710185c37028873234b1464847d5 -Reviewed-by: Ulf Hermann ---- - src/imports/folderlistmodel/plugin.cpp | 1 + - src/imports/labsanimation/plugin.cpp | 1 + - src/imports/labsmodels/plugin.cpp | 1 + - src/imports/layouts/plugin.cpp | 1 + - src/imports/localstorage/plugin.cpp | 1 + - src/imports/settings/plugin.cpp | 1 + - src/imports/sharedimage/plugin.cpp | 1 + - src/imports/statemachine/plugin.cpp | 1 + - src/imports/testlib/main.cpp | 1 + - src/imports/wavefrontmesh/plugin.cpp | 1 + - src/imports/window/plugin.cpp | 1 + - src/particles/qtquickparticlesglobal_p.h | 1 + - src/qml/qml/qqmlextensionplugin.h | 7 +++++++ - src/qml/qtqmlglobal_p.h | 2 ++ - src/qmlmodels/qtqmlmodelsglobal_p.h | 1 + - src/qmlworkerscript/qtqmlworkerscriptglobal_p.h | 1 + - src/quick/qtquickglobal_p.h | 1 + - src/quickshapes/qquickshapesglobal_p.h | 2 ++ - 18 files changed, 26 insertions(+) - -diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp -index 7a38769b77..7206df6664 100644 ---- a/src/imports/folderlistmodel/plugin.cpp -+++ b/src/imports/folderlistmodel/plugin.cpp -@@ -43,6 +43,7 @@ - #include "qquickfolderlistmodel.h" - - extern void qml_register_types_Qt_labs_folderlistmodel(); -+GHS_KEEP_REFERENCE(qml_register_types_Qt_labs_folderlistmodel); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/labsanimation/plugin.cpp b/src/imports/labsanimation/plugin.cpp -index 9c985f0dcf..c35be764f9 100644 ---- a/src/imports/labsanimation/plugin.cpp -+++ b/src/imports/labsanimation/plugin.cpp -@@ -43,6 +43,7 @@ - #include "qquickboundaryrule_p.h" - - extern void qml_register_types_Qt_labs_animation(); -+GHS_KEEP_REFERENCE(qml_register_types_Qt_labs_animation); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/labsmodels/plugin.cpp b/src/imports/labsmodels/plugin.cpp -index ab5e0023a6..b06491e663 100644 ---- a/src/imports/labsmodels/plugin.cpp -+++ b/src/imports/labsmodels/plugin.cpp -@@ -51,6 +51,7 @@ - #endif - - extern void qml_register_types_Qt_labs_qmlmodels(); -+GHS_KEEP_REFERENCE(qml_register_types_Qt_labs_qmlmodels); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/layouts/plugin.cpp b/src/imports/layouts/plugin.cpp -index af270c1732..b6ae516eee 100644 ---- a/src/imports/layouts/plugin.cpp -+++ b/src/imports/layouts/plugin.cpp -@@ -43,6 +43,7 @@ - #include "qquickstacklayout_p.h" - - extern void qml_register_types_QtQuick_Layouts(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQuick_Layouts); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp -index e488b3d43c..0291ed4715 100644 ---- a/src/imports/localstorage/plugin.cpp -+++ b/src/imports/localstorage/plugin.cpp -@@ -43,6 +43,7 @@ - #include - - extern void qml_register_types_QtQuick_LocalStorage(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQuick_LocalStorage); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/settings/plugin.cpp b/src/imports/settings/plugin.cpp -index e8e640412b..e83147f612 100644 ---- a/src/imports/settings/plugin.cpp -+++ b/src/imports/settings/plugin.cpp -@@ -43,6 +43,7 @@ - #include "qqmlsettings_p.h" - - extern void qml_register_types_Qt_labs_settings(); -+GHS_KEEP_REFERENCE(qml_register_types_Qt_labs_settings); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/sharedimage/plugin.cpp b/src/imports/sharedimage/plugin.cpp -index d7c2ef8d17..79168d933b 100644 ---- a/src/imports/sharedimage/plugin.cpp -+++ b/src/imports/sharedimage/plugin.cpp -@@ -100,6 +100,7 @@ - */ - - extern void qml_register_types_Qt_labs_sharedimage(); -+GHS_KEEP_REFERENCE(qml_register_types_Qt_labs_sharedimage); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/statemachine/plugin.cpp b/src/imports/statemachine/plugin.cpp -index c370504029..abb238965e 100644 ---- a/src/imports/statemachine/plugin.cpp -+++ b/src/imports/statemachine/plugin.cpp -@@ -49,6 +49,7 @@ - #include - - extern void qml_register_types_QtQml_StateMachine(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQml_StateMachine); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp -index 83fc150e6c..1da251c49b 100644 ---- a/src/imports/testlib/main.cpp -+++ b/src/imports/testlib/main.cpp -@@ -51,6 +51,7 @@ QML_DECLARE_TYPE(QuickTestEvent) - QML_DECLARE_TYPE(QuickTestUtil) - - extern void qml_register_types_QtTest(); -+GHS_KEEP_REFERENCE(qml_register_types_QtTest); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/wavefrontmesh/plugin.cpp b/src/imports/wavefrontmesh/plugin.cpp -index eea0db19db..edd4d1dba5 100644 ---- a/src/imports/wavefrontmesh/plugin.cpp -+++ b/src/imports/wavefrontmesh/plugin.cpp -@@ -43,6 +43,7 @@ - #include "qwavefrontmesh.h" - - extern void qml_register_types_Qt_labs_wavefrontmesh(); -+GHS_KEEP_REFERENCE(qml_register_types_Qt_labs_wavefrontmesh); - - QT_BEGIN_NAMESPACE - -diff --git a/src/imports/window/plugin.cpp b/src/imports/window/plugin.cpp -index 5152fa02ec..ff2f10fde3 100644 ---- a/src/imports/window/plugin.cpp -+++ b/src/imports/window/plugin.cpp -@@ -42,6 +42,7 @@ - #include "plugin.h" - - extern void qml_register_types_QtQuick_Window(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQuick_Window); - - QT_BEGIN_NAMESPACE - -diff --git a/src/particles/qtquickparticlesglobal_p.h b/src/particles/qtquickparticlesglobal_p.h -index 927bc29050..91c2764060 100644 ---- a/src/particles/qtquickparticlesglobal_p.h -+++ b/src/particles/qtquickparticlesglobal_p.h -@@ -66,5 +66,6 @@ - #endif - - void Q_QUICKPARTICLES_PRIVATE_EXPORT qml_register_types_QtQuick_Particles(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQuick_Particles); - - #endif // QTQUICKPARTICLESGLOBAL_P_H -diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h -index ef7ff422cd..afb3f99c4a 100644 ---- a/src/qml/qml/qqmlextensionplugin.h -+++ b/src/qml/qml/qqmlextensionplugin.h -@@ -44,6 +44,13 @@ - #include - #include - -+#if defined(Q_CC_GHS) -+# define GHS_PRAGMA(S) _Pragma(#S) -+# define GHS_KEEP_REFERENCE(S) GHS_PRAGMA(ghs reference S ##__Fv) -+#else -+# define GHS_KEEP_REFERENCE(S) -+#endif -+ - QT_BEGIN_NAMESPACE - - class QQmlEngine; -diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h -index a729729b67..7b0910fa13 100644 ---- a/src/qml/qtqmlglobal_p.h -+++ b/src/qml/qtqmlglobal_p.h -@@ -53,6 +53,7 @@ - - #include - #include -+#include - #ifndef QT_QML_BOOTSTRAPPED - # include - #endif -@@ -61,6 +62,7 @@ - #define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT - - void Q_QML_PRIVATE_EXPORT qml_register_types_QtQml(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQml); - - #if !defined(QT_QMLDEVTOOLS_LIB) && !defined(QT_BUILD_QMLDEVTOOLS_LIB) - # define Q_QML_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT -diff --git a/src/qmlmodels/qtqmlmodelsglobal_p.h b/src/qmlmodels/qtqmlmodelsglobal_p.h -index 1a1157138d..24df6ef7b3 100644 ---- a/src/qmlmodels/qtqmlmodelsglobal_p.h -+++ b/src/qmlmodels/qtqmlmodelsglobal_p.h -@@ -59,5 +59,6 @@ - #define Q_QMLMODELS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT - - void Q_QMLMODELS_PRIVATE_EXPORT qml_register_types_QtQml_Models(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQml_Models); - - #endif // QTQMLMODELSGLOBAL_P_H -diff --git a/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h b/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h -index c75d5f3129..6452567f6b 100644 ---- a/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h -+++ b/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h -@@ -58,5 +58,6 @@ - #define Q_QMLWORKERSCRIPT_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT - - void Q_QMLWORKERSCRIPT_PRIVATE_EXPORT qml_register_types_QtQml_WorkerScript(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQml_WorkerScript); - - #endif // QTQMLWORKERSCRIPTGLOBAL_P_H -diff --git a/src/quick/qtquickglobal_p.h b/src/quick/qtquickglobal_p.h -index 80e59563c7..97680569e7 100644 ---- a/src/quick/qtquickglobal_p.h -+++ b/src/quick/qtquickglobal_p.h -@@ -62,6 +62,7 @@ - #define Q_QUICK_PRIVATE_EXPORT Q_QUICK_EXPORT - - void Q_QUICK_PRIVATE_EXPORT qml_register_types_QtQuick(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQuick); - - QT_BEGIN_NAMESPACE - -diff --git a/src/quickshapes/qquickshapesglobal_p.h b/src/quickshapes/qquickshapesglobal_p.h -index 40f6cfbdcf..37386c23b2 100644 ---- a/src/quickshapes/qquickshapesglobal_p.h -+++ b/src/quickshapes/qquickshapesglobal_p.h -@@ -51,6 +51,7 @@ - // We mean it. - // - -+#include - #include "qquickshapesglobal.h" - - QT_BEGIN_NAMESPACE -@@ -60,5 +61,6 @@ QT_BEGIN_NAMESPACE - QT_END_NAMESPACE - - void Q_QUICKSHAPES_PRIVATE_EXPORT qml_register_types_QtQuick_Shapes(); -+GHS_KEEP_REFERENCE(qml_register_types_QtQuick_Shapes); - - #endif // QQUICKSHAPESGLOBAL_P_H --- -2.31.1 - diff --git a/0007-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch b/0007-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch new file mode 100644 index 0000000..a22fa4c --- /dev/null +++ b/0007-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch @@ -0,0 +1,73 @@ +From 7dd0d9f9ce9bbd5e21f017069256d52b397a6195 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 07/18] 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.37.3 + diff --git a/0008-QML-Text-doesn-t-reset-lineCount-when-text-is-empty.patch b/0008-QML-Text-doesn-t-reset-lineCount-when-text-is-empty.patch deleted file mode 100644 index dca0e95..0000000 --- a/0008-QML-Text-doesn-t-reset-lineCount-when-text-is-empty.patch +++ /dev/null @@ -1,83 +0,0 @@ -From f4afe4934819a7f0fb9754b9bb08fb1acb818058 Mon Sep 17 00:00:00 2001 -From: Shinichi Okada -Date: Tue, 17 Nov 2020 14:15:50 +0900 -Subject: [PATCH 08/28] QML Text doesn't reset lineCount when text is empty - -lineCount is not reset when replacing a multi-line QML Text 'text' -property with an "" empty string. Also, the lineCountChanged signal is -not emitted - -Task-number: QTBUG-84458 -Change-Id: Ic3c02e6a90e6675eadbaafc6af6ab0356ee98123 -Reviewed-by: Fabian Kosmale -(cherry picked from commit ae1b9c6d94001411efeef600e22638906e0fa990) -Reviewed-by: Qt Cherry-pick Bot ---- - src/quick/items/qquicktext.cpp | 2 + - .../auto/quick/qquicktext/tst_qquicktext.cpp | 37 +++++++++++++++++++ - 2 files changed, 39 insertions(+) - -diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp -index 90469ee82b..581ab9f76a 100644 ---- a/src/quick/items/qquicktext.cpp -+++ b/src/quick/items/qquicktext.cpp -@@ -398,6 +398,8 @@ void QQuickTextPrivate::updateSize() - layedOutTextRect = QRectF(0, 0, 0, fontHeight); - advance = QSizeF(); - signalSizeChange(previousSize); -+ lineCount = 1; -+ emit q->lineCountChanged(); - updateType = UpdatePaintNode; - q->update(); - return; -diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp -index 42fdbea58d..308c6b5091 100644 ---- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp -+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp -@@ -2243,6 +2243,43 @@ void tst_qquicktext::lineCount() - QCOMPARE(myText->lineCount(), 2); - QCOMPARE(myText->truncated(), true); - QCOMPARE(myText->maximumLineCount(), 2); -+ -+ // QTBUG-84458 -+ myText->resetMaximumLineCount(); -+ myText->setText("qqqqq\nqqqqq"); -+ QCOMPARE(myText->lineCount(), 2); -+ myText->setText("qqqqq\nqqqqq\nqqqqq"); -+ QCOMPARE(myText->lineCount(), 3); -+ myText->setText(""); -+ QCOMPARE(myText->lineCount(), 1); -+ -+ myText->setText("qqqqq\nqqqqq\nqqqqq"); -+ QCOMPARE(myText->lineCount(), 3); -+ myText->setFontSizeMode(QQuickText::HorizontalFit); -+ myText->setText(""); -+ QCOMPARE(myText->lineCount(), 1); -+ -+ myText->setText("qqqqq\nqqqqq\nqqqqq"); -+ QCOMPARE(myText->lineCount(), 3); -+ myText->setFontSizeMode(QQuickText::VerticalFit); -+ myText->setText(""); -+ QCOMPARE(myText->lineCount(), 1); -+ -+ myText->setText("qqqqq\nqqqqq\nqqqqq"); -+ QCOMPARE(myText->lineCount(), 3); -+ myText->setFontSizeMode(QQuickText::Fit); -+ myText->setText(""); -+ QCOMPARE(myText->lineCount(), 1); -+ -+ QScopedPointer layoutWindow(createView(testFile("lineLayoutHAlign.qml"))); -+ QQuickText *lineLaidOut = layoutWindow->rootObject()->findChild("myText"); -+ QVERIFY(lineLaidOut != nullptr); -+ -+ lineLaidOut->setText("qqqqq\nqqqqq\nqqqqq"); -+ QCOMPARE(lineLaidOut->lineCount(), 3); -+ lineLaidOut->setFontSizeMode(QQuickText::FixedSize); -+ lineLaidOut->setText(""); -+ QCOMPARE(lineLaidOut->lineCount(), 1); - } - - void tst_qquicktext::lineHeight() --- -2.31.1 - diff --git a/0008-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch b/0008-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch new file mode 100644 index 0000000..b7b7d58 --- /dev/null +++ b/0008-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch @@ -0,0 +1,61 @@ +From ad102f786a12d0cc139bfbebea8edbab3dd8206d Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 16 Nov 2021 22:43:37 +0100 +Subject: [PATCH 08/18] 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.37.3 + diff --git a/0009-Doc-mention-that-INCLUDEPATH-must-be-set-in-some-cas.patch b/0009-Doc-mention-that-INCLUDEPATH-must-be-set-in-some-cas.patch deleted file mode 100644 index 6a943fd..0000000 --- a/0009-Doc-mention-that-INCLUDEPATH-must-be-set-in-some-cas.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4d6078e4b556e83f55ffed55f14203c3ed880c62 Mon Sep 17 00:00:00 2001 -From: Mitch Curtis -Date: Thu, 19 Nov 2020 16:39:23 +0100 -Subject: [PATCH 09/28] Doc: mention that INCLUDEPATH must be set in some cases - -Otherwise the generated type registrations .cpp file will not be able -to include the sources. - -Change-Id: I7821c7674b4341546da2fc49e584bf10cc60b46f -Reviewed-by: Ulf Hermann -(cherry picked from commit 06c31f386f8664343debd219a522a8897df0f3ec) -Reviewed-by: Qt Cherry-pick Bot ---- - src/qml/doc/src/cppintegration/definetypes.qdoc | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc -index cbbbd9ba58..ece2fd5fd7 100644 ---- a/src/qml/doc/src/cppintegration/definetypes.qdoc -+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc -@@ -117,6 +117,14 @@ QML_IMPORT_NAME = com.mycompany.messaging - QML_IMPORT_MAJOR_VERSION = 1 - \endcode - -+If the header the class is declared in is not accessible from your project's -+include path, you may have to amend the include path so that the generated -+registration code can be compiled: -+ -+\code -+INCLUDEPATH += com/mycompany/messaging -+\endcode -+ - The type can be used in an \l{qtqml-syntax-basics.html#object-declarations} - {object declaration} from QML, and its properties can be read and written to, - as per the example below: --- -2.31.1 - diff --git a/0009-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch b/0009-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch new file mode 100644 index 0000000..fde8f4b --- /dev/null +++ b/0009-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch @@ -0,0 +1,36 @@ +From 2d11778ce9348716ce936ce11c89ced58d8ec188 Mon Sep 17 00:00:00 2001 +From: Marc Mutz +Date: Tue, 21 Dec 2021 09:20:17 +0100 +Subject: [PATCH 09/18] 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.37.3 + diff --git a/0010-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch b/0010-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch new file mode 100644 index 0000000..a3c1aa3 --- /dev/null +++ b/0010-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch @@ -0,0 +1,51 @@ +From eb04ee7e02c5e7a2b84b129c09f13025242688d6 Mon Sep 17 00:00:00 2001 +From: Ulf Hermann +Date: Thu, 3 Feb 2022 10:02:06 +0100 +Subject: [PATCH 10/18] 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 9899c9274e..272b85069f 100644 +--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp ++++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp +@@ -1160,8 +1160,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); +@@ -1191,7 +1190,7 @@ void QObjectWrapper::destroyObject(bool lastCall) + } + } + +- h->~Data(); ++ h->destroy(); + } + + +-- +2.37.3 + diff --git a/0010-qmlfunctions.qdoc-Add-clarification-to-QML_FOREIGN.patch b/0010-qmlfunctions.qdoc-Add-clarification-to-QML_FOREIGN.patch deleted file mode 100644 index 993d4d9..0000000 --- a/0010-qmlfunctions.qdoc-Add-clarification-to-QML_FOREIGN.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 65851a450926befad65d9cffcaa217875d1936c6 Mon Sep 17 00:00:00 2001 -From: Maximilian Goldstein -Date: Mon, 23 Nov 2020 13:17:40 +0100 -Subject: [PATCH 10/28] qmlfunctions.qdoc: Add clarification to QML_FOREIGN - -Fixes: QTBUG-87150 -Change-Id: If99a06a07892bdfef7b6b1e8fa737480750992fe -Reviewed-by: Fabian Kosmale -(cherry picked from commit 56f428c360191230b571969a2651e85380030afa) ---- - examples/qml/doc/src/qml-extending.qdoc | 4 ++++ - src/qml/doc/src/qmlfunctions.qdoc | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/examples/qml/doc/src/qml-extending.qdoc b/examples/qml/doc/src/qml-extending.qdoc -index 723e470d45..c9922ebd45 100644 ---- a/examples/qml/doc/src/qml-extending.qdoc -+++ b/examples/qml/doc/src/qml-extending.qdoc -@@ -79,6 +79,10 @@ Qt's internal QLineEdit class. - - \snippet referenceexamples/extended/lineedit.h 0 - -+Note the usage of \l QML_NAMED_ELEMENT() instead of \l QML_ELEMENT. -+QML_ELEMENT uses the name of the containing type by default, "LineEditExtension" in this case. -+As the class being an extension class is an implementation detail, we choose the more natural name "LineEdit" instead -+ - The QML engine then instantiates a \l QLineEdit: - - \snippet referenceexamples/extended/main.cpp 1 -diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc -index 12b7efb159..4e531ceb61 100644 ---- a/src/qml/doc/src/qmlfunctions.qdoc -+++ b/src/qml/doc/src/qmlfunctions.qdoc -@@ -250,6 +250,10 @@ - This is useful for registering types that cannot be amended to add the macros, - for example because they belong to 3rdparty libraries. - -+ \b{NOTE:} You may want to use \l QML_NAMED_ELEMENT() instead of \l QML_ELEMENT due to the fact that -+ the element will be named like the struct it is contained in, not the foreign type. -+ See \l {Extending QML - Extension Objects Example} for an example. -+ - \sa QML_ELEMENT, QML_NAMED_ELEMENT() - */ - --- -2.31.1 - diff --git a/0011-Fix-QML-property-cache-leaks-of-delegate-items.patch b/0011-Fix-QML-property-cache-leaks-of-delegate-items.patch deleted file mode 100644 index 4ad7e95..0000000 --- a/0011-Fix-QML-property-cache-leaks-of-delegate-items.patch +++ /dev/null @@ -1,214 +0,0 @@ -From b2862e2bd84d651c1f4fb2ced96ee6f40ea1f3e4 Mon Sep 17 00:00:00 2001 -From: Andrei Golubev -Date: Fri, 20 Nov 2020 10:44:44 +0100 -Subject: [PATCH 11/28] Fix QML property cache leaks of delegate items - -The delegate items are destroyed through an event loop by a call to a -deleteLater(). This, however, doesn't work when the application is -in the process of exiting and the event loop is already closed (i.e. -we're in a stack unwinding part that starts after app.exec()) - -Combat this situation by setting a parent of the to-be-deleted object -to some QObject that will be destroyed e.g. QCoreApplication::instance() -before the program finishes. As QObjects clean their children on -destruction, this will make sure that we cleanup the previously leaking -thing regardless of the event loop - -Added a test to check that delegates are destroyed (as a separate binary -due to differences in main() function) - -Fixes: QTBUG-87228 -Change-Id: I59066603b77497fe4fd8d051798c3e4b47c119f0 -Reviewed-by: Fabian Kosmale -(cherry picked from commit 3a5617dc45e281552b9c1f7a04f0561b8fa14d94) ---- - src/qmlmodels/qqmldelegatemodel.cpp | 11 ++- - .../qquickview_extra/data/qtbug_87228.qml | 30 ++++++++ - .../qquickview_extra/qquickview_extra.pro | 12 +++ - .../qquickview_extra/tst_qquickview_extra.cpp | 77 +++++++++++++++++++ - tests/auto/quick/quick.pro | 1 + - 5 files changed, 130 insertions(+), 1 deletion(-) - create mode 100644 tests/auto/quick/qquickview_extra/data/qtbug_87228.qml - create mode 100644 tests/auto/quick/qquickview_extra/qquickview_extra.pro - create mode 100644 tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp - -diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp -index 725b9e8bc3..12c3d11937 100644 ---- a/src/qmlmodels/qqmldelegatemodel.cpp -+++ b/src/qmlmodels/qqmldelegatemodel.cpp -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2020 The Qt Company Ltd. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtQml module of the Qt Toolkit. -@@ -2379,6 +2379,15 @@ void QQmlDelegateModelItem::destroyObject() - data->ownContext = nullptr; - data->context = nullptr; - } -+ /* QTBUG-87228: when destroying object at the application exit, the deferred -+ * parent by setting it to QCoreApplication instance if it's nullptr, so -+ * deletion won't work. Not to leak memory, make sure our object has a that -+ * the parent claims the object at the end of the lifetime. When not at the -+ * application exit, normal event loop will handle the deferred deletion -+ * earlier. -+ */ -+ if (object->parent() == nullptr) -+ object->setParent(QCoreApplication::instance()); - object->deleteLater(); - - if (attached) { -diff --git a/tests/auto/quick/qquickview_extra/data/qtbug_87228.qml b/tests/auto/quick/qquickview_extra/data/qtbug_87228.qml -new file mode 100644 -index 0000000000..ff10eba23d ---- /dev/null -+++ b/tests/auto/quick/qquickview_extra/data/qtbug_87228.qml -@@ -0,0 +1,30 @@ -+import QtQml 2.12 -+import QtQml.Models 2.12 -+import QtQuick 2.12 -+ -+Item { -+ height: 480 -+ width: 320 -+ Rectangle { -+ id: rootRect -+ -+ function addItem(desc) { -+ myModel.append({"desc": desc}); -+ } -+ -+ Rectangle { -+ ListView { -+ objectName: "listView" -+ delegate: Text { -+ required property string desc -+ text: desc -+ } -+ model: ListModel { id: myModel } -+ } -+ } -+ -+ Component.onCompleted: { -+ addItem("Test creation of a delegate with a property"); -+ } -+ } -+} -diff --git a/tests/auto/quick/qquickview_extra/qquickview_extra.pro b/tests/auto/quick/qquickview_extra/qquickview_extra.pro -new file mode 100644 -index 0000000000..b40af0ce19 ---- /dev/null -+++ b/tests/auto/quick/qquickview_extra/qquickview_extra.pro -@@ -0,0 +1,12 @@ -+CONFIG += testcase -+TARGET = tst_qquickview_extra -+macx:CONFIG -= app_bundle -+ -+SOURCES += tst_qquickview_extra.cpp -+ -+include (../../shared/util.pri) -+include (../shared/util.pri) -+ -+TESTDATA = data/* -+ -+QT += core-private gui-private qml-private quick-private testlib -diff --git a/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp b/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp -new file mode 100644 -index 0000000000..f697a438bd ---- /dev/null -+++ b/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp -@@ -0,0 +1,77 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2020 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the test suite of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -+** 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 General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3 as published by the Free Software -+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -+** 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-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+#include -+#include -+#include -+#include -+#include -+#include "../../shared/util.h" -+#include -+#include -+ -+// Extra app-less tests -+class tst_QQuickViewExtra : public QQmlDataTest -+{ -+ Q_OBJECT -+public: -+ tst_QQuickViewExtra(); -+ -+private slots: -+ void qtbug_87228(); -+}; -+ -+tst_QQuickViewExtra::tst_QQuickViewExtra() { } -+ -+void tst_QQuickViewExtra::qtbug_87228() -+{ -+ QScopedPointer deletionSpy; -+ { -+ int argc = 0; -+ QGuiApplication app(argc, nullptr); -+ QQuickView view; -+ -+ view.setSource(testFileUrl("qtbug_87228.qml")); -+ view.show(); -+ QTimer::singleShot(500, &app, QCoreApplication::quit); -+ app.exec(); -+ -+ QObject *listView = view.findChild("listView"); -+ QVERIFY(listView); -+ QQuickItem *contentItem = listView->property("contentItem").value(); -+ QVERIFY(contentItem); -+ auto children = contentItem->childItems(); -+ QVERIFY(children.size() > 0); -+ // for the sake of this test, any child would be suitable, so pick first -+ deletionSpy.reset(new QSignalSpy(children[0], SIGNAL(destroyed(QObject *)))); -+ } -+ QCOMPARE(deletionSpy->count(), 1); -+} -+ -+QTEST_APPLESS_MAIN(tst_QQuickViewExtra) -+ -+#include "tst_qquickview_extra.moc" -diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro -index 541bfdd527..45bcf8a9ce 100644 ---- a/tests/auto/quick/quick.pro -+++ b/tests/auto/quick/quick.pro -@@ -85,6 +85,7 @@ QUICKTESTS += \ - qquicktextinput \ - qquickvisualdatamodel \ - qquickview \ -+ qquickview_extra \ - qquickcanvasitem \ - qquickdesignersupport \ - qquickscreen \ --- -2.31.1 - diff --git a/0011-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch b/0011-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch new file mode 100644 index 0000000..bedaf01 --- /dev/null +++ b/0011-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch @@ -0,0 +1,84 @@ +From 436f3c0550f64b4cb629480a6b7ceb1381f30501 Mon Sep 17 00:00:00 2001 +From: Vlad Zahorodnii +Date: Sat, 29 Jan 2022 21:59:33 +0200 +Subject: [PATCH 11/18] 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.37.3 + diff --git a/0012-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch b/0012-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch new file mode 100644 index 0000000..50f9d95 --- /dev/null +++ b/0012-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch @@ -0,0 +1,122 @@ +From 74c8c421763597f778313ea976fffdc03183226b Mon Sep 17 00:00:00 2001 +From: Fabian Kosmale +Date: Wed, 4 May 2022 09:10:54 +0200 +Subject: [PATCH 12/18] 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.37.3 + diff --git a/0012-QQuickTextInput-Store-mask-data-in-std-unique_ptr.patch b/0012-QQuickTextInput-Store-mask-data-in-std-unique_ptr.patch deleted file mode 100644 index d0a67e2..0000000 --- a/0012-QQuickTextInput-Store-mask-data-in-std-unique_ptr.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 89ea9f1f9468aa47718cbb398317c63a9479adf2 Mon Sep 17 00:00:00 2001 -From: Fabian Kosmale -Date: Tue, 24 Nov 2020 13:23:23 +0100 -Subject: [PATCH 12/28] QQuickTextInput: Store mask data in std::unique_ptr - -This ensures that the memory is freed reliably - -Fixes: QTBUG-88807 -Change-Id: I841a5a2b226a69ce50975d95702a948857d1b54f -Reviewed-by: Eskil Abrahamsen Blomfeldt -(cherry picked from commit d2d8e90e9f218103d60737e1273ab5322834d9ec) -Reviewed-by: Qt Cherry-pick Bot ---- - src/quick/items/qquicktextinput.cpp | 6 ++---- - src/quick/items/qquicktextinput_p_p.h | 4 +++- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp -index 6275b298ed..bb78ead0e8 100644 ---- a/src/quick/items/qquicktextinput.cpp -+++ b/src/quick/items/qquicktextinput.cpp -@@ -3831,8 +3831,7 @@ void QQuickTextInputPrivate::parseInputMask(const QString &maskFields) - int delimiter = maskFields.indexOf(QLatin1Char(';')); - if (maskFields.isEmpty() || delimiter == 0) { - if (m_maskData) { -- delete [] m_maskData; -- m_maskData = nullptr; -+ m_maskData.reset(nullptr); - m_maxLength = 32767; - internalSetText(QString()); - } -@@ -3863,8 +3862,7 @@ void QQuickTextInputPrivate::parseInputMask(const QString &maskFields) - m_maxLength++; - } - -- delete [] m_maskData; -- m_maskData = new MaskInputData[m_maxLength]; -+ m_maskData.reset(new MaskInputData[m_maxLength]); - - MaskInputData::Casemode m = MaskInputData::NoCaseMode; - c = 0; -diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h -index 7965f3d3f4..7fbba49405 100644 ---- a/src/quick/items/qquicktextinput_p_p.h -+++ b/src/quick/items/qquicktextinput_p_p.h -@@ -58,6 +58,8 @@ - - #include "qplatformdefs.h" - -+#include -+ - // - // W A R N I N G - // ------------- -@@ -230,7 +232,7 @@ public: - - QQuickItem *cursorItem; - QQuickTextNode *textNode; -- MaskInputData *m_maskData; -+ std::unique_ptr m_maskData; - QInputControl *m_inputControl; - - QList m_transactions; --- -2.31.1 - diff --git a/0013-Fix-crash-when-calling-hasOwnProperty-on-proxy-objec.patch b/0013-Fix-crash-when-calling-hasOwnProperty-on-proxy-objec.patch deleted file mode 100644 index 87c2aaf..0000000 --- a/0013-Fix-crash-when-calling-hasOwnProperty-on-proxy-objec.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 810a0afe1e9bd14e4393a73bf6c299b25745dbc5 Mon Sep 17 00:00:00 2001 -From: Richard Weickelt -Date: Tue, 24 Nov 2020 01:14:28 +0100 -Subject: [PATCH 13/28] Fix crash when calling hasOwnProperty() on proxy object - -Property pointer p needs to be checked for nullptr value in -QV4::ProxyObject::virtualGetOwnProperty(). This can happen when calling -hasOwnProperty() or propertyIsEnumerable(). - -Fixes: QTBUG-88786 -Change-Id: I43da58fed4d8656f9187213f7317f17398739e34 -Reviewed-by: Ulf Hermann -(cherry picked from commit 9b321a34490cd17c0eb043b69bd7c9d8d8f513d5) -Reviewed-by: Richard Weickelt ---- - src/qml/jsruntime/qv4proxy.cpp | 10 +++--- - .../qml/qqmlecmascript/tst_qqmlecmascript.cpp | 31 ++++++++++++++++++- - 2 files changed, 36 insertions(+), 5 deletions(-) - -diff --git a/src/qml/jsruntime/qv4proxy.cpp b/src/qml/jsruntime/qv4proxy.cpp -index 24676ffd00..1505eae426 100644 ---- a/src/qml/jsruntime/qv4proxy.cpp -+++ b/src/qml/jsruntime/qv4proxy.cpp -@@ -265,9 +265,9 @@ PropertyAttributes ProxyObject::virtualGetOwnProperty(const Managed *m, Property - ScopedProperty targetDesc(scope); - PropertyAttributes targetAttributes = target->getOwnProperty(id, targetDesc); - if (trapResult->isUndefined()) { -- p->value = Encode::undefined(); -- if (targetAttributes == Attr_Invalid) { -+ if (p) - p->value = Encode::undefined(); -+ if (targetAttributes == Attr_Invalid) { - return Attr_Invalid; - } - if (!targetAttributes.isConfigurable() || !target->isExtensible()) { -@@ -295,8 +295,10 @@ PropertyAttributes ProxyObject::virtualGetOwnProperty(const Managed *m, Property - } - } - -- p->value = resultDesc->value; -- p->set = resultDesc->set; -+ if (p) { -+ p->value = resultDesc->value; -+ p->set = resultDesc->set; -+ } - return resultAttributes; - } - -diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp -index 1e10841430..3a9d1bfb4c 100644 ---- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp -+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp -@@ -382,7 +382,7 @@ private slots: - void semicolonAfterProperty(); - void hugeStack(); - void variantConversionMethod(); -- -+ void proxyHandlerTraps(); - void gcCrashRegressionTest(); - - private: -@@ -9306,6 +9306,35 @@ void tst_qqmlecmascript::variantConversionMethod() - QCOMPARE(obj.funcCalled, QLatin1String("QModelIndex")); - } - -+void tst_qqmlecmascript::proxyHandlerTraps() -+{ -+ const QString expression = QStringLiteral(R"SNIPPET( -+ (function(){ -+ const target = { -+ prop: 47 -+ }; -+ const handler = { -+ getOwnPropertyDescriptor(target, prop) { -+ return { configurable: true, enumerable: true, value: 47 }; -+ } -+ }; -+ const proxy = new Proxy(target, handler); -+ -+ // QTBUG-88786 -+ if (!proxy.propertyIsEnumerable("prop")) -+ throw Error("FAIL: propertyisEnumerable"); -+ if (!proxy.hasOwnProperty("prop")) -+ throw Error("FAIL: hasOwnProperty"); -+ -+ return "SUCCESS"; -+ })() -+ )SNIPPET"); -+ -+ QJSEngine engine; -+ QJSValue value = engine.evaluate(expression); -+ QVERIFY(value.isString() && value.toString() == QStringLiteral("SUCCESS")); -+} -+ - QTEST_MAIN(tst_qqmlecmascript) - - #include "tst_qqmlecmascript.moc" --- -2.31.1 - diff --git a/0013-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch b/0013-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch new file mode 100644 index 0000000..241a805 --- /dev/null +++ b/0013-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch @@ -0,0 +1,43 @@ +From 76113c63af23d516f488f5e6b9062ca97e062e9e Mon Sep 17 00:00:00 2001 +From: Marc Mutz +Date: Tue, 16 Jul 2019 11:23:37 +0200 +Subject: [PATCH 13/18] 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 53b6fe117f..f7cb8bede3 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.37.3 + diff --git a/0014-Accessibility-event-is-sent-on-item-s-geometry-chang.patch b/0014-Accessibility-event-is-sent-on-item-s-geometry-chang.patch deleted file mode 100644 index eb74307..0000000 --- a/0014-Accessibility-event-is-sent-on-item-s-geometry-chang.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 514a69659a56fda410f4ab955f03c0d2a38b52f9 Mon Sep 17 00:00:00 2001 -From: Piotr Mikolajczyk -Date: Tue, 10 Nov 2020 14:58:12 +0100 -Subject: [PATCH 14/28] Accessibility event is sent on item's geometry change -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In case of enabled accessibility, whenever the geometry -of a QQuickItem changes, accessibility module is notified -by a LocationChange event. This enables responding to this -by for example moving the accessibility frame on the screen. - -Task-number: QTBUG-79611 -Change-Id: I808e835384ef42bba2e9aabecf4be3cda07859fe -Reviewed-by: Jan Arve Sæther -(cherry picked from commit def81070668f101e1e2cbb46d586bbab64c8e00f) -Reviewed-by: Assam Boudjelthia ---- - src/quick/items/qquickitem.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp -index 67c4611d9e..ddd67522b9 100644 ---- a/src/quick/items/qquickitem.cpp -+++ b/src/quick/items/qquickitem.cpp -@@ -3753,6 +3753,14 @@ void QQuickItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeo - emit widthChanged(); - if (change.heightChange()) - emit heightChanged(); -+#if QT_CONFIG(accessibility) -+ if (QAccessible::isActive()) { -+ if (QObject *acc = QQuickAccessibleAttached::findAccessible(this)) { -+ QAccessibleEvent ev(acc, QAccessible::LocationChanged); -+ QAccessible::updateAccessibility(&ev); -+ } -+ } -+#endif - } - - /*! --- -2.31.1 - diff --git a/0014-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch b/0014-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch new file mode 100644 index 0000000..63d6cf3 --- /dev/null +++ b/0014-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch @@ -0,0 +1,68 @@ +From 985358efb1e60a8ff493da4d6ca9056f63dc9982 Mon Sep 17 00:00:00 2001 +From: Marc Mutz +Date: Tue, 16 Jul 2019 11:31:01 +0200 +Subject: [PATCH 14/18] 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 f7cb8bede3..219cdd5966 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.37.3 + diff --git a/0015-Fix-Flickable-wheel-velocity-calculation.patch b/0015-Fix-Flickable-wheel-velocity-calculation.patch new file mode 100644 index 0000000..f8837b2 --- /dev/null +++ b/0015-Fix-Flickable-wheel-velocity-calculation.patch @@ -0,0 +1,423 @@ +From 8dbc2a0a112752ab85c688ba66e86e5598896aae Mon Sep 17 00:00:00 2001 +From: Shawn Rutledge +Date: Tue, 4 May 2021 10:12:39 +0200 +Subject: [PATCH 15/18] Fix Flickable wheel velocity calculation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Angular velocity is defined as angle rotated divided by time elapsed. +But the historical problem with Flickable is that the calculation +ignored time, as if there was a maximum frequency of events and we +only needed to know the rotation angle per fixed unit of time. +With "clicky" mouse wheels perhaps it was a reasonable approximation. +With touchpads that provide pixel deltas, we've been doing the velocity +calculation the right way since a6ed830f4779e218b8e8f8d82dc4aa9b4b4528a1 +Now we divide by dt also in the wheel rotation case. + +That gives instantaneous velocity. Next question: how to do smoothing? +AxisData::velocityBuffer is basically a Kalman filter, but until now +it was used only when dragging ends and we animate the deceleration from +the velocity at that time. It seems to work well for smoothing the +velocity that comes from wheel events, too. So now we use that instead +of smoothVelocity, and it stays in control better. + +Next question: when a series of wheel events occurs, we have valid +dt for the dy / dt velocity calculation (or dx / dt horizontally), +but what about the initial flick? What if first thing the user does +is rotate a physical mouse wheel by one "click", how far should +Flickable move before it comes to rest? QStyleHints::wheelScrollLines() +tells us how far to move for one wheel event... in "lines", whatever +that is. Flickable doesn't know about its contents. But it "feels" +reasonable if we define a "line" as 24 pixels. At least the setting +will do something now: applications can adjust it, and some system +control panels can adjust it. A subclass of QQuickFlickable (such as +TableView) could even change QQFlickablePrivate::initialWheelFlickDistance +to be the actual number of pixels per "line", to scroll exactly by rows. +(But when the events occur faster, it moves further and faster, like it +always did.) + +OK so we know how far we want to move when the Flickable is at rest +and receives a QWheelEvent with angleDelta of 120. I.e. when isMoving() +is false. So I tried an experiment: set dt to 0.25. How far did it move? +77 pixels. Why? We're making it move via QQuickFlickablePrivate::flick() +which does some math and drives the timeline. The key formula is +qreal dist = v2 / (accel * 2.0) +which agrees with the testing: if the wheel turns by 120 units, +(120 / 0.25)^2 / (1500 * 2) =~ 77 +So it's possible to do the algebra to reverse-engineer what dt should be +so that we will move the right distance with a single wheel event, +despite the complexity of the animation itself. That's what is now +done. When the user rotates the wheel very slowly, it moves by discrete +amounts but with smooth animation. A little faster, and it speeds up, +somewhat like it did before, but with more control. If it has sped +up to a high speed and then the user rotates the wheel backwards, +it reverses instantly: we clear the Kalman filter and insert instantaneous +velocity (so it will go from there at the next event). + +On a touchpad, it also feels quite in-control because the velocity +is calculated properly as distance-delta / time-delta. Smoothing +it out doesn't hurt, and animating after release doesn't hurt. +It longer goes "zing" out of control when the wheel events come in too +frequently from a touchpad or a free-spinning wheel. + +None of this affects trackpads on macOS, because then the wheel events +have phases and pixel deltas, and we don't use this animation. We still +should try to get that working on as many OSes as possible, eventually. + +Clarify the meaning of the flickDeceleration property. + +[ChangeLog][QtQuick][Flickable] Flickable no longer tries to detect +whether you're using a "clicky" wheel or a touchpad, but rather does the +velocity calculation more correctly with elapsed time (dθ / dt). +A single rotation of a "clicky" wheel also moves a fixed distance, +which is now adjustable via QStyleHints::wheelScrollLines(). +Animation is restored, but should now stay in control on touchpads; +and it will once again transition the "moving" properties correctly +when scrolling ends. + +Fixes: QTBUG-56075 +Pick-to: 6.2 +Change-Id: I5166ca31c86335641cf407a922a3a970fced653d +Reviewed-by: Richard Moe Gustavsen +(cherry picked from commit a8fbd865140d4dd165723c7e3d4168514d4b1d0c) +--- + src/quick/items/qquickflickable.cpp | 95 +++++++++++++------ + src/quick/items/qquickflickable_p_p.h | 1 + + src/quick/util/qquicktimeline.cpp | 3 + + .../qquickflickable/tst_qquickflickable.cpp | 9 +- + tests/manual/touch/flicktext.qml | 30 ++++++ + 5 files changed, 107 insertions(+), 31 deletions(-) + +diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp +index e12e85db64..9eea0e1487 100644 +--- a/src/quick/items/qquickflickable.cpp ++++ b/src/quick/items/qquickflickable.cpp +@@ -263,7 +263,8 @@ QQuickFlickablePrivate::QQuickFlickablePrivate() + , deceleration(QML_FLICK_DEFAULTDECELERATION) + , maxVelocity(QML_FLICK_DEFAULTMAXVELOCITY), reportedVelocitySmoothing(100) + , delayedPressEvent(nullptr), pressDelay(0), fixupDuration(400) +- , flickBoost(1.0), fixupMode(Normal), vTime(0), visibleArea(nullptr) ++ , flickBoost(1.0), initialWheelFlickDistance(qApp->styleHints()->wheelScrollLines() * 24) ++ , fixupMode(Normal), vTime(0), visibleArea(nullptr) + , flickableDirection(QQuickFlickable::AutoFlickDirection) + , boundsBehavior(QQuickFlickable::DragAndOvershootBounds) + , boundsMovement(QQuickFlickable::FollowBoundsBehavior) +@@ -531,10 +532,14 @@ void QQuickFlickablePrivate::updateBeginningEnd() + if (atBeginning != vData.atBeginning) { + vData.atBeginning = atBeginning; + atYBeginningChange = true; ++ if (!vData.moving && atBeginning) ++ vData.smoothVelocity.setValue(0); + } + if (atEnd != vData.atEnd) { + vData.atEnd = atEnd; + atYEndChange = true; ++ if (!vData.moving && atEnd) ++ vData.smoothVelocity.setValue(0); + } + + // Horizontal +@@ -547,10 +552,14 @@ void QQuickFlickablePrivate::updateBeginningEnd() + if (atBeginning != hData.atBeginning) { + hData.atBeginning = atBeginning; + atXBeginningChange = true; ++ if (!hData.moving && atBeginning) ++ hData.smoothVelocity.setValue(0); + } + if (atEnd != hData.atEnd) { + hData.atEnd = atEnd; + atXEndChange = true; ++ if (!hData.moving && atEnd) ++ hData.smoothVelocity.setValue(0); + } + + if (vData.extentsChanged) { +@@ -1489,6 +1498,7 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event) + d->hData.velocity = 0; + d->timer.start(); + d->maybeBeginDrag(currentTimestamp, event->position()); ++ d->lastPosTime = -1; + break; + case Qt::NoScrollPhase: // default phase with an ordinary wheel mouse + case Qt::ScrollUpdate: +@@ -1515,20 +1525,34 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event) + return; + } + ++ qreal elapsed = qreal(currentTimestamp - d->lastPosTime) / qreal(1000); ++ if (elapsed <= 0) { ++ d->lastPosTime = currentTimestamp; ++ qCDebug(lcWheel) << "insufficient elapsed time: can't calculate velocity" << elapsed; ++ return; ++ } ++ + if (event->source() == Qt::MouseEventNotSynthesized || event->pixelDelta().isNull()) { +- // physical mouse wheel, so use angleDelta ++ // no pixel delta (physical mouse wheel, or "dumb" touchpad), so use angleDelta + int xDelta = event->angleDelta().x(); + int yDelta = event->angleDelta().y(); ++ // For a single "clicky" wheel event (angleDelta +/- 120), ++ // we want flick() to end up moving a distance proportional to QStyleHints::wheelScrollLines(). ++ // The decel algo from there is ++ // qreal dist = v2 / (accel * 2.0); ++ // i.e. initialWheelFlickDistance = (120 / dt)^2 / (deceleration * 2) ++ // now solve for dt: ++ // dt = 120 / sqrt(deceleration * 2 * initialWheelFlickDistance) ++ if (!isMoving()) ++ elapsed = 120 / qSqrt(d->deceleration * 2 * d->initialWheelFlickDistance); + if (yflick() && yDelta != 0) { +- bool valid = false; +- if (yDelta > 0 && contentY() > -minYExtent()) { +- d->vData.velocity = qMax(yDelta*2 - d->vData.smoothVelocity.value(), qreal(d->maxVelocity/4)); +- valid = true; +- } else if (yDelta < 0 && contentY() < -maxYExtent()) { +- d->vData.velocity = qMin(yDelta*2 - d->vData.smoothVelocity.value(), qreal(-d->maxVelocity/4)); +- valid = true; +- } +- if (valid) { ++ qreal instVelocity = yDelta / elapsed; ++ // if the direction has changed, start over with filtering, to allow instant movement in the opposite direction ++ if ((instVelocity < 0 && d->vData.velocity > 0) || (instVelocity > 0 && d->vData.velocity < 0)) ++ d->vData.velocityBuffer.clear(); ++ d->vData.addVelocitySample(instVelocity, d->maxVelocity); ++ d->vData.updateVelocity(); ++ if ((yDelta > 0 && contentY() > -minYExtent()) || (yDelta < 0 && contentY() < -maxYExtent())) { + d->flickY(d->vData.velocity); + d->flickingStarted(false, true); + if (d->vData.flicking) { +@@ -1539,15 +1563,13 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event) + } + } + if (xflick() && xDelta != 0) { +- bool valid = false; +- if (xDelta > 0 && contentX() > -minXExtent()) { +- d->hData.velocity = qMax(xDelta*2 - d->hData.smoothVelocity.value(), qreal(d->maxVelocity/4)); +- valid = true; +- } else if (xDelta < 0 && contentX() < -maxXExtent()) { +- d->hData.velocity = qMin(xDelta*2 - d->hData.smoothVelocity.value(), qreal(-d->maxVelocity/4)); +- valid = true; +- } +- if (valid) { ++ qreal instVelocity = xDelta / elapsed; ++ // if the direction has changed, start over with filtering, to allow instant movement in the opposite direction ++ if ((instVelocity < 0 && d->hData.velocity > 0) || (instVelocity > 0 && d->hData.velocity < 0)) ++ d->hData.velocityBuffer.clear(); ++ d->hData.addVelocitySample(instVelocity, d->maxVelocity); ++ d->hData.updateVelocity(); ++ if ((xDelta > 0 && contentX() > -minXExtent()) || (xDelta < 0 && contentX() < -maxXExtent())) { + d->flickX(d->hData.velocity); + d->flickingStarted(true, false); + if (d->hData.flicking) { +@@ -1562,18 +1584,13 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event) + int xDelta = event->pixelDelta().x(); + int yDelta = event->pixelDelta().y(); + +- qreal elapsed = qreal(currentTimestamp - d->lastPosTime) / 1000.; +- if (elapsed <= 0) { +- d->lastPosTime = currentTimestamp; +- return; +- } + QVector2D velocity(xDelta / elapsed, yDelta / elapsed); +- d->lastPosTime = currentTimestamp; + d->accumulatedWheelPixelDelta += QVector2D(event->pixelDelta()); + d->drag(currentTimestamp, event->type(), event->position(), d->accumulatedWheelPixelDelta, + true, !d->scrollingPhase, true, velocity); + event->accept(); + } ++ d->lastPosTime = currentTimestamp; + + if (!event->isAccepted()) + QQuickItem::wheelEvent(event); +@@ -1744,6 +1761,10 @@ void QQuickFlickable::componentComplete() + setContentX(-minXExtent()); + if (!d->vData.explicitValue && d->vData.startMargin != 0.) + setContentY(-minYExtent()); ++ if (lcWheel().isDebugEnabled() || lcVel().isDebugEnabled()) { ++ d->timeline.setObjectName(QLatin1String("timeline for Flickable ") + objectName()); ++ d->velocityTimeline.setObjectName(QLatin1String("velocity timeline for Flickable ") + objectName()); ++ } + } + + void QQuickFlickable::viewportMoved(Qt::Orientations orient) +@@ -2504,9 +2525,23 @@ void QQuickFlickable::setMaximumFlickVelocity(qreal v) + + /*! + \qmlproperty real QtQuick::Flickable::flickDeceleration +- This property holds the rate at which a flick will decelerate. +- +- The default value is platform dependent. ++ This property holds the rate at which a flick will decelerate: ++ the higher the number, the faster it slows down when the user stops ++ flicking via touch, touchpad or mouse wheel. For example 0.0001 is nearly ++ "frictionless", and 10000 feels quite "sticky". ++ ++ The default value is platform dependent. Values of zero or less are not allowed. ++ ++ \note For touchpad flicking, some platforms drive Flickable directly by ++ sending QWheelEvents with QWheelEvent::phase() being \c Qt::ScrollMomentum, ++ after the user has released all fingers from the touchpad. In that case, ++ the operating system is controlling the deceleration, and this property has ++ no effect. ++ ++ \note For mouse wheel scrolling, and for gesture scrolling on touchpads ++ that do not have a momentum phase, extremely large values of ++ flickDeceleration can make Flickable very resistant to scrolling, ++ especially if \l maximumFlickVelocity is too small. + */ + qreal QQuickFlickable::flickDeceleration() const + { +@@ -2519,7 +2554,7 @@ void QQuickFlickable::setFlickDeceleration(qreal deceleration) + Q_D(QQuickFlickable); + if (deceleration == d->deceleration) + return; +- d->deceleration = deceleration; ++ d->deceleration = qMax(0.001, deceleration); + emit flickDecelerationChanged(); + } + +diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h +index 414c9c33d6..6163613493 100644 +--- a/src/quick/items/qquickflickable_p_p.h ++++ b/src/quick/items/qquickflickable_p_p.h +@@ -241,6 +241,7 @@ public: + int pressDelay; + int fixupDuration; + qreal flickBoost; ++ qreal initialWheelFlickDistance; + + enum FixupMode { Normal, Immediate, ExtentChanged }; + FixupMode fixupMode; +diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp +index 7ec7c827eb..abe6eb7261 100644 +--- a/src/quick/util/qquicktimeline.cpp ++++ b/src/quick/util/qquicktimeline.cpp +@@ -53,6 +53,8 @@ + + QT_BEGIN_NAMESPACE + ++Q_LOGGING_CATEGORY(lcTl, "qt.quick.timeline") ++ + struct Update { + Update(QQuickTimeLineValue *_g, qreal _v) + : g(_g), v(_v) {} +@@ -513,6 +515,7 @@ void QQuickTimeLine::reset(QQuickTimeLineValue &timeLineValue) + qWarning() << "QQuickTimeLine: Cannot reset a QQuickTimeLineValue owned by another timeline."; + return; + } ++ qCDebug(lcTl) << static_cast(this) << timeLineValue.value(); + remove(&timeLineValue); + timeLineValue._t = nullptr; + } +diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +index f3659290eb..9fa51da6f8 100644 +--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp ++++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +@@ -870,6 +870,7 @@ void tst_qquickflickable::wheel() + QVERIFY(flick != nullptr); + QQuickFlickablePrivate *fp = QQuickFlickablePrivate::get(flick); + QSignalSpy moveEndSpy(flick, SIGNAL(movementEnded())); ++ quint64 timestamp = 10; + + // test a vertical flick + { +@@ -877,6 +878,7 @@ void tst_qquickflickable::wheel() + QWheelEvent event(pos, window->mapToGlobal(pos), QPoint(), QPoint(0,-120), + Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false); + event.setAccepted(false); ++ event.setTimestamp(timestamp); + QGuiApplication::sendEvent(window.data(), &event); + } + +@@ -887,6 +889,7 @@ void tst_qquickflickable::wheel() + QCOMPARE(fp->velocityTimeline.isActive(), false); + QCOMPARE(fp->timeline.isActive(), false); + QTest::qWait(50); // make sure that onContentYChanged won't sneak in again ++ timestamp += 50; + QCOMPARE(flick->property("movementsAfterEnd").value(), 0); // QTBUG-55886 + + // get ready to test horizontal flick +@@ -900,8 +903,8 @@ void tst_qquickflickable::wheel() + QPoint pos(200, 200); + QWheelEvent event(pos, window->mapToGlobal(pos), QPoint(), QPoint(-120,0), + Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false); +- + event.setAccepted(false); ++ event.setTimestamp(timestamp); + QGuiApplication::sendEvent(window.data(), &event); + } + +@@ -926,11 +929,13 @@ void tst_qquickflickable::trackpad() + QVERIFY(flick != nullptr); + QSignalSpy moveEndSpy(flick, SIGNAL(movementEnded())); + QPoint pos(200, 200); ++ quint64 timestamp = 10; + + { + QWheelEvent event(pos, window->mapToGlobal(pos), QPoint(0,-100), QPoint(0,-120), + Qt::NoButton, Qt::NoModifier, Qt::ScrollBegin, false); + event.setAccepted(false); ++ event.setTimestamp(timestamp++); + QGuiApplication::sendEvent(window.data(), &event); + } + +@@ -944,6 +949,7 @@ void tst_qquickflickable::trackpad() + QWheelEvent event(pos, window->mapToGlobal(pos), QPoint(-100,0), QPoint(-120,0), + Qt::NoButton, Qt::NoModifier, Qt::ScrollUpdate, false); + event.setAccepted(false); ++ event.setTimestamp(timestamp++); + QGuiApplication::sendEvent(window.data(), &event); + } + +@@ -954,6 +960,7 @@ void tst_qquickflickable::trackpad() + QWheelEvent event(pos, window->mapToGlobal(pos), QPoint(0,0), QPoint(0,0), + Qt::NoButton, Qt::NoModifier, Qt::ScrollEnd, false); + event.setAccepted(false); ++ event.setTimestamp(timestamp++); + QGuiApplication::sendEvent(window.data(), &event); + } + +diff --git a/tests/manual/touch/flicktext.qml b/tests/manual/touch/flicktext.qml +index 9e84261687..e69d6207a9 100644 +--- a/tests/manual/touch/flicktext.qml ++++ b/tests/manual/touch/flicktext.qml +@@ -380,6 +380,36 @@ Rectangle { + text: "content X " + flick.contentX.toFixed(2) + " Y " + flick.contentY.toFixed(2) + } + } ++ ++ Column { ++ Row { ++ spacing: 2 ++ Examples.Button { ++ id: decrButton ++ text: "-" ++ onClicked: flick.flickDeceleration -= 100 ++ Timer { ++ running: decrButton.pressed ++ interval: 100; repeat: true ++ onTriggered: flick.flickDeceleration -= 100 ++ } ++ } ++ Text { ++ horizontalAlignment: Text.AlignHCenter ++ text: "decel:\n" + flick.flickDeceleration.toFixed(4) ++ } ++ Examples.Button { ++ id: incrButton ++ text: "+" ++ onClicked: flick.flickDeceleration += 100 ++ } ++ Timer { ++ running: incrButton.pressed ++ interval: 100; repeat: true ++ onTriggered: flick.flickDeceleration += 100 ++ } ++ } ++ } + } + + Component.onCompleted: { +-- +2.37.3 + diff --git a/0015-qmltypes.prf-Take-abi-into-account-for-_metatypes.js.patch b/0015-qmltypes.prf-Take-abi-into-account-for-_metatypes.js.patch deleted file mode 100644 index e9a65ba..0000000 --- a/0015-qmltypes.prf-Take-abi-into-account-for-_metatypes.js.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3c075bfd348306cd553caddb9f8bf3f596666636 Mon Sep 17 00:00:00 2001 -From: Alessandro Portale -Date: Wed, 25 Nov 2020 23:43:03 +0100 -Subject: [PATCH 15/28] qmltypes.prf: Take abi into account for - *_metatypes.json file names - -The lib/metatypes/*_metatypes.json file names contain the ABI. When -constructing the qmltyperegistrar command, the right file names -with that ABI part need to be passed as "foreign-types". - -Fixes: QTBUG-85888 -Fixes: QTBUG-87117 -Change-Id: I20daac1b6b9a27c5ac48b3c2c685e2fed301e213 -Reviewed-by: Assam Boudjelthia -(cherry picked from commit acc5e48a90d0daeccb28175b80ab6b52cac5d84a) ---- - src/qmltyperegistrar/qmltypes.prf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf -index 354fa1736f..2cc0027b7e 100644 ---- a/src/qmltyperegistrar/qmltypes.prf -+++ b/src/qmltyperegistrar/qmltypes.prf -@@ -44,7 +44,8 @@ qt_module_deps = $$replace(qt_module_deps, _private$, '') - qt_module_deps = $$unique(qt_module_deps) - - for(dep, qt_module_deps) { -- METATYPES_FILENAME = $$lower($$eval(QT.$${dep}.module))_metatypes.json -+ android:ABI = _$${ANDROID_TARGET_ARCH} -+ METATYPES_FILENAME = $$lower($$eval(QT.$${dep}.module))$${ABI}_metatypes.json - INSTALLED_METATYPES = $$[QT_INSTALL_LIBS]/metatypes/$$METATYPES_FILENAME - isEmpty(MODULE_BASE_OUTDIR) { - QML_FOREIGN_METATYPES += $$INSTALLED_METATYPES --- -2.31.1 - diff --git a/0016-Fix-Flickable-with-QTBUG-56075-patch-applied.patch b/0016-Fix-Flickable-with-QTBUG-56075-patch-applied.patch new file mode 100644 index 0000000..8eb6c76 --- /dev/null +++ b/0016-Fix-Flickable-with-QTBUG-56075-patch-applied.patch @@ -0,0 +1,25 @@ +From 46e932d87ffd6b2437b0411dd792112f5d4380fa Mon Sep 17 00:00:00 2001 +From: Wolfgang Frisch +Date: Thu, 19 May 2022 00:55:50 +0200 +Subject: [PATCH 16/18] Fix Flickable with QTBUG-56075 patch applied + +--- + src/quick/items/qquickflickable.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp +index 9eea0e1487..2fa3b7142c 100644 +--- a/src/quick/items/qquickflickable.cpp ++++ b/src/quick/items/qquickflickable.cpp +@@ -62,6 +62,8 @@ + QT_BEGIN_NAMESPACE + + Q_DECLARE_LOGGING_CATEGORY(lcHandlerParent) ++Q_LOGGING_CATEGORY(lcWheel, "qt.quick.flickable.wheel") ++Q_LOGGING_CATEGORY(lcVel, "qt.quick.flickable.velocity") + + // FlickThreshold determines how far the "mouse" must have moved + // before we perform a flick. +-- +2.37.3 + diff --git a/0016-qv4qmlcontext-Fix-bounded-signal-expressions-when-de.patch b/0016-qv4qmlcontext-Fix-bounded-signal-expressions-when-de.patch deleted file mode 100644 index 70346aa..0000000 --- a/0016-qv4qmlcontext-Fix-bounded-signal-expressions-when-de.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 37c290c5b8659256ff574a06a3df2c363ae446b5 Mon Sep 17 00:00:00 2001 -From: Maximilian Goldstein -Date: Wed, 2 Dec 2020 13:08:57 +0100 -Subject: [PATCH 16/28] qv4qmlcontext: Fix bounded signal expressions when - debugging - -Fixes: QTBUG-83599 -Change-Id: I8909f0b2d3eca909512b99c172c8dc5e93e48482 -Reviewed-by: Ulf Hermann -(cherry picked from commit bad85119bf35468292cfd80ecc934b66515f0c68) -Reviewed-by: Qt Cherry-pick Bot ---- - src/qml/jsruntime/qv4qmlcontext.cpp | 4 ++-- - .../qml/debugger/qv4debugger/tst_qv4debugger.cpp | 12 +++++++++--- - 2 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/src/qml/jsruntime/qv4qmlcontext.cpp b/src/qml/jsruntime/qv4qmlcontext.cpp -index e2d3b98ff6..6eece147a6 100644 ---- a/src/qml/jsruntime/qv4qmlcontext.cpp -+++ b/src/qml/jsruntime/qv4qmlcontext.cpp -@@ -466,9 +466,9 @@ ReturnedValue QQmlContextWrapper::resolveQmlContextPropertyLookupGetter(Lookup * - return static_cast(ctx)->locals[index].asReturnedValue(); - } - -- // Skip only block contexts within the current call context. -+ // Skip only block and call contexts. - // Other contexts need a regular QML property lookup. See below. -- if (ctx->type != Heap::ExecutionContext::Type_BlockContext) -+ if (ctx->type != Heap::ExecutionContext::Type_BlockContext && ctx->type != Heap::ExecutionContext::Type_CallContext) - break; - } - -diff --git a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp -index 84f5eebd10..e3cbeb9891 100644 ---- a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp -+++ b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp -@@ -910,19 +910,25 @@ void tst_qv4debugger::signalParameters() - component.setData("import QtQml 2.12\n" - "QtObject {\n" - " id: root\n" -- " property string result\n" -+ " property string result: 'unset'\n" -+ " property string resultCallbackInternal: 'unset'\n" -+ " property string resultCallbackExternal: 'unset'\n" - " signal signalWithArg(string textArg)\n" -+ " function call(callback) { callback(); }\n" -+ " function externalCallback() { root.resultCallbackExternal = textArg; }\n" - " property Connections connections : Connections {\n" - " target: root\n" -- " onSignalWithArg: { root.result = textArg; }\n" -+ " onSignalWithArg: { root.result = textArg; call(function() { root.resultCallbackInternal = textArg; }); call(externalCallback); }\n" - " }\n" - " Component.onCompleted: signalWithArg('something')\n" - "}", QUrl("test.qml")); - -- QVERIFY(component.isReady()); -+ QVERIFY2(component.isReady(), qPrintable(component.errorString())); - QScopedPointer obj(component.create()); - QVERIFY(obj); - QCOMPARE(obj->property("result").toString(), QLatin1String("something")); -+ QCOMPARE(obj->property("resultCallbackInternal").toString(), QLatin1String("something")); -+ QCOMPARE(obj->property("resultCallbackExternal").toString(), QLatin1String("unset")); - } - - QTEST_MAIN(tst_qv4debugger) --- -2.31.1 - diff --git a/0017-Reset-currentChanges-if-currentChanges-is-active-whe.patch b/0017-Reset-currentChanges-if-currentChanges-is-active-whe.patch new file mode 100644 index 0000000..e7c8df8 --- /dev/null +++ b/0017-Reset-currentChanges-if-currentChanges-is-active-whe.patch @@ -0,0 +1,38 @@ +From 10d77845723f1e7fa60bbb0f60f708949f3a538c Mon Sep 17 00:00:00 2001 +From: Tony Leinonen +Date: Thu, 21 Oct 2021 14:44:02 +0300 +Subject: [PATCH 17/18] 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 13e7b87049..c8ea286d3e 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.37.3 + diff --git a/0017-Use-load-qt_tool-for-qmltime.patch b/0017-Use-load-qt_tool-for-qmltime.patch deleted file mode 100644 index 1f0c7f0..0000000 --- a/0017-Use-load-qt_tool-for-qmltime.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 30c7a6c6a874264800d398df8c3ec65f30707c92 Mon Sep 17 00:00:00 2001 -From: Li Xinwei <1326710505@qq.com> -Date: Tue, 8 Dec 2020 15:36:01 +0800 -Subject: [PATCH 17/28] Use load(qt_tool) for qmltime - -The qmltime should be a tool, not a normal executable or an app. - -Change-Id: I64c76877907297a6a817ba5903786bcc7fba8fdd -Reviewed-by: Alexandru Croitor -(cherry picked from commit e6e262da1423bcb7cfe3db9f83fe0df54483c8d4) ---- - tools/qmltime/qmltime.pro | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/qmltime/qmltime.pro b/tools/qmltime/qmltime.pro -index c915f6e8c1..366d90f75b 100644 ---- a/tools/qmltime/qmltime.pro -+++ b/tools/qmltime/qmltime.pro -@@ -1,4 +1,3 @@ --TEMPLATE = app - TARGET = qmltime - QT += qml quick - QT += quick-private -@@ -12,3 +11,5 @@ QMAKE_TARGET_DESCRIPTION = QML Time - - SOURCES += qmltime.cpp - HEADERS += qmltime.h -+ -+load(qt_tool) --- -2.31.1 - diff --git a/0018-Revert-Fix-ListView.isCurrentItem-when-used-with-Del.patch b/0018-Revert-Fix-ListView.isCurrentItem-when-used-with-Del.patch new file mode 100644 index 0000000..d51482e --- /dev/null +++ b/0018-Revert-Fix-ListView.isCurrentItem-when-used-with-Del.patch @@ -0,0 +1,94 @@ +From 45d43c04088efb8346979f633f72bb1f23183461 Mon Sep 17 00:00:00 2001 +From: Mitch Curtis +Date: Thu, 4 Nov 2021 10:41:28 +0100 +Subject: [PATCH 18/18] Revert "Fix ListView.isCurrentItem when used with + DelegateModel" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit d9f9d773e92940786f159897623618f3bf6bcf0f. + +It causes a heap-use-after-free in tst_swipeview.qml. + +Task-number: QTBUG-97423 +Pick-to: 5.15 6.1 6.2 +Change-Id: I42e9831ae1399a010df28c39496a7778121f5e35 +Reviewed-by: Jan Arve Sæther +Reviewed-by: Oliver Eftevaag +(cherry picked from commit 5d656b31eb371c9e0bb97c558f9193b08471f1d7) +--- + src/quick/items/qquickitemview.cpp | 2 -- + .../quick/qquicklistview/data/qtbug86744.qml | 21 ------------------- + .../qquicklistview/tst_qquicklistview.cpp | 14 ------------- + 3 files changed, 37 deletions(-) + delete mode 100644 tests/auto/quick/qquicklistview/data/qtbug86744.qml + +diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp +index c8ea286d3e..f8ad168a17 100644 +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -2402,8 +2402,6 @@ void QQuickItemView::createdItem(int index, QObject* object) + d->repositionPackageItemAt(item, index); + else if (index == d->currentIndex) + d->updateCurrent(index); +- } else if (index == d->currentIndex) { +- d->updateCurrent(index); + } + } + +diff --git a/tests/auto/quick/qquicklistview/data/qtbug86744.qml b/tests/auto/quick/qquicklistview/data/qtbug86744.qml +deleted file mode 100644 +index 6dc82d57eb..0000000000 +--- a/tests/auto/quick/qquicklistview/data/qtbug86744.qml ++++ /dev/null +@@ -1,21 +0,0 @@ +-import QtQuick 2.15 +-import QtQml.Models 2.15 +- +-Item { +- height: 200 +- width: 100 +- DelegateModel { +- id: dm +- model: 2 +- delegate: Item { +- width: 100; height: 20 +- property bool isCurrent: ListView.isCurrentItem +- } +- } +- ListView { +- objectName: "listView" +- model: dm +- currentIndex: 1 +- anchors.fill: parent +- } +-} +diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +index df329f8318..b564fd3ba5 100644 +--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp ++++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +@@ -10201,20 +10201,6 @@ void tst_QQuickListView::dragDelegateWithMouseArea_data() + } + } + +-void tst_QQuickListView::isCurrentItem_DelegateModel() +-{ +- QScopedPointer window(createView()); +- window->setSource(testFileUrl("qtbug86744.qml")); +- window->resize(640, 480); +- window->show(); +- QVERIFY(QTest::qWaitForWindowExposed(window.data())); +- +- QQuickListView* listView = window->rootObject()->findChild("listView"); +- QVERIFY(listView); +- QVariant value = listView->itemAtIndex(1)->property("isCurrent"); +- QVERIFY(value.toBool() == true); +-} +- + QTEST_MAIN(tst_QQuickListView) + + #include "tst_qquicklistview.moc" +-- +2.37.3 + diff --git a/0018-qqmlistmodel-Fix-crash-when-modelCache-is-null.patch b/0018-qqmlistmodel-Fix-crash-when-modelCache-is-null.patch deleted file mode 100644 index 934c6c2..0000000 --- a/0018-qqmlistmodel-Fix-crash-when-modelCache-is-null.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 83100a84f2b0068b4cf725896bbb810415908334 Mon Sep 17 00:00:00 2001 -From: Maximilian Goldstein -Date: Tue, 8 Dec 2020 09:26:36 +0100 -Subject: [PATCH 18/28] qqmlistmodel: Fix crash when modelCache is null - -Fixes: QTBUG-89173 -Change-Id: Ife82518808fc5504ec42407e80ed3de89ed4adeb -Reviewed-by: Fabian Kosmale -(cherry picked from commit c3860cd04bbc089ef95bc441a1f8f1e46f9606f8) -Reviewed-by: Qt Cherry-pick Bot ---- - src/qmlmodels/qqmllistmodel.cpp | 2 +- - .../qml/qqmllistmodel/tst_qqmllistmodel.cpp | 22 +++++++++++++++++++ - 2 files changed, 23 insertions(+), 1 deletion(-) - -diff --git a/src/qmlmodels/qqmllistmodel.cpp b/src/qmlmodels/qqmllistmodel.cpp -index e07951cab3..8830e08097 100644 ---- a/src/qmlmodels/qqmllistmodel.cpp -+++ b/src/qmlmodels/qqmllistmodel.cpp -@@ -703,7 +703,7 @@ void ListModel::set(int elementIndex, QV4::Object *object, ListModel::SetElement - } else if (propertyValue->isNullOrUndefined()) { - if (reason == SetElement::WasJustInserted) { - QQmlError err; -- auto memberName = propertyName->toString(m_modelCache->engine())->toQString(); -+ auto memberName = propertyName->toString(v4)->toQString(); - err.setDescription(QString::fromLatin1("%1 is %2. Adding an object with a %2 member does not create a role for it.").arg(memberName, propertyValue->isNull() ? QLatin1String("null") : QLatin1String("undefined"))); - qmlWarning(nullptr, err); - } else { -diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp -index d54e3467b7..1953798a15 100644 ---- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp -+++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp -@@ -130,6 +130,7 @@ private slots: - void dynamic_roles_crash_QTBUG_38907(); - void nestedListModelIteration(); - void undefinedAppendShouldCauseError(); -+ void nullPropertyCrash(); - }; - - bool tst_qqmllistmodel::compareVariantList(const QVariantList &testList, QVariant object) -@@ -1723,6 +1724,27 @@ void tst_qqmllistmodel::undefinedAppendShouldCauseError() - QScopedPointer(component.create()); - } - -+// QTBUG-89173 -+void tst_qqmllistmodel::nullPropertyCrash() -+{ -+ QQmlEngine engine; -+ QQmlComponent component(&engine); -+ component.setData( -+ R"(import QtQuick 2.15 -+ ListView { -+ model: ListModel { id: listModel } -+ -+ delegate: Item {} -+ -+ Component.onCompleted: { -+ listModel.append({"a": "value1", "b":[{"c":"value2"}]}) -+ listModel.append({"a": "value2", "b":[{"c":null}]}) -+ } -+ })", -+ QUrl()); -+ QTest::ignoreMessage(QtMsgType::QtWarningMsg, ": c is null. Adding an object with a null member does not create a role for it."); -+ QScopedPointer(component.create()); -+} - - QTEST_MAIN(tst_qqmllistmodel) - --- -2.31.1 - diff --git a/0019-Show-a-tableview-even-if-the-syncView-has-an-empty-m.patch b/0019-Show-a-tableview-even-if-the-syncView-has-an-empty-m.patch deleted file mode 100644 index e7c8a95..0000000 --- a/0019-Show-a-tableview-even-if-the-syncView-has-an-empty-m.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 1241e4f3c3ec010ae121f5d56c3e9405ec43231f Mon Sep 17 00:00:00 2001 -From: Andy Shaw -Date: Fri, 6 Nov 2020 13:30:12 +0100 -Subject: [PATCH 19/28] Show a tableview even if the syncView has an empty - model - -By showing the tableview, we can be sure that headerviews will be -visible even in the syncView has an empty model. - -Fixes: QTBUG-87526 -Change-Id: I68c8b119122a2d2f88c2afbeb2d6c71a83a3ce33 -Reviewed-by: Richard Moe Gustavsen -(cherry picked from commit 27c254203b3e7dd6d3a4445feb205fbe98c32d30) -Reviewed-by: Qt Cherry-pick Bot ---- - src/quick/items/qquicktableview.cpp | 7 +-- - .../qquicktableview/tst_qquicktableview.cpp | 43 +++++++++++++++++++ - 2 files changed, 45 insertions(+), 5 deletions(-) - -diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp -index 7b73fcb393..1349d308d7 100644 ---- a/src/quick/items/qquicktableview.cpp -+++ b/src/quick/items/qquicktableview.cpp -@@ -1760,11 +1760,8 @@ void QQuickTableViewPrivate::calculateTopLeft(QPoint &topLeftCell, QPointF &topL - const auto syncView_d = syncView->d_func(); - - if (syncView_d->loadedItems.isEmpty()) { -- // The sync view contains no loaded items. This probably means -- // that it has not been rebuilt yet. Which also means that -- // we cannot rebuild anything before this happens. -- topLeftCell.rx() = kEdgeIndexNotSet; -- topLeftCell.ry() = kEdgeIndexNotSet; -+ topLeftCell.rx() = 0; -+ topLeftCell.ry() = 0; - return; - } - -diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp -index 54f73c6e0c..d489a873e4 100644 ---- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp -+++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp -@@ -176,6 +176,7 @@ private slots: - void checkSyncView_connect_late_data(); - void checkSyncView_connect_late(); - void checkSyncView_pageFlicking(); -+ void checkSyncView_emptyModel(); - void delegateWithRequiredProperties(); - void checkThatFetchMoreIsCalledWhenScrolledToTheEndOfTable(); - void replaceModel(); -@@ -2731,6 +2732,48 @@ void tst_QQuickTableView::checkSyncView_pageFlicking() - QVERIFY(tableViewPrivate->scheduledRebuildOptions & QQuickTableViewPrivate::RebuildOption::CalculateNewTopLeftRow); - } - -+void tst_QQuickTableView::checkSyncView_emptyModel() -+{ -+ // When a tableview has a syncview with an empty model then it should still be -+ // showing the tableview without depending on the syncview. This is particularly -+ // important for headerviews for example -+ LOAD_TABLEVIEW("syncviewsimple.qml"); -+ GET_QML_TABLEVIEW(tableViewH); -+ GET_QML_TABLEVIEW(tableViewV); -+ GET_QML_TABLEVIEW(tableViewHV); -+ QQuickTableView *views[] = {tableViewH, tableViewV, tableViewHV}; -+ -+ auto model = TestModelAsVariant(100, 100); -+ -+ for (auto view : views) -+ view->setModel(model); -+ -+ WAIT_UNTIL_POLISHED_ARG(tableViewHV); -+ -+ // Check that geometry properties are mirrored -+ QCOMPARE(tableViewH->columnSpacing(), tableView->columnSpacing()); -+ QCOMPARE(tableViewH->rowSpacing(), 0); -+ QCOMPARE(tableViewH->contentWidth(), tableView->contentWidth()); -+ QVERIFY(tableViewH->contentHeight() > 0); -+ QCOMPARE(tableViewV->columnSpacing(), 0); -+ QCOMPARE(tableViewV->rowSpacing(), tableView->rowSpacing()); -+ QCOMPARE(tableViewV->contentHeight(), tableView->contentHeight()); -+ QVERIFY(tableViewV->contentWidth() > 0); -+ -+ QCOMPARE(tableViewH->contentX(), tableView->contentX()); -+ QCOMPARE(tableViewH->contentY(), 0); -+ QCOMPARE(tableViewV->contentX(), 0); -+ QCOMPARE(tableViewV->contentY(), tableView->contentY()); -+ QCOMPARE(tableViewHV->contentX(), tableView->contentX()); -+ QCOMPARE(tableViewHV->contentY(), tableView->contentY()); -+ -+ QCOMPARE(tableViewHPrivate->loadedTableOuterRect.left(), tableViewPrivate->loadedTableOuterRect.left()); -+ QCOMPARE(tableViewHPrivate->loadedTableOuterRect.top(), 0); -+ -+ QCOMPARE(tableViewVPrivate->loadedTableOuterRect.top(), tableViewPrivate->loadedTableOuterRect.top()); -+ QCOMPARE(tableViewVPrivate->loadedTableOuterRect.left(), 0); -+} -+ - void tst_QQuickTableView::checkThatFetchMoreIsCalledWhenScrolledToTheEndOfTable() - { - LOAD_TABLEVIEW("plaintableview.qml"); --- -2.31.1 - diff --git a/0020-DesignerSupport-Don-t-skip-already-inspected-objects.patch b/0020-DesignerSupport-Don-t-skip-already-inspected-objects.patch deleted file mode 100644 index a573a9d..0000000 --- a/0020-DesignerSupport-Don-t-skip-already-inspected-objects.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5e0ba6b797ca7843609fc19d8c4c96f6f26aacd2 Mon Sep 17 00:00:00 2001 -From: Miikka Heikkinen -Date: Tue, 15 Dec 2020 12:43:40 +0200 -Subject: [PATCH 20/28] DesignerSupport: Don't skip already inspected objects - -Already inspected objects should not be skipped when determining their -properties, as recursive call will always have different base name for -the properties. - -Internally we don't need inspectedObjects list at all anymore, but -it's kept to avoid changing API and in case the caller is interested -in inspected objects. - -Fixes: QDS-3301 -Change-Id: I76198b96d420e2a5ae6b13cfee65df4bce22d8f5 -Pick-to: dev -Reviewed-by: Mahmoud Badri -Reviewed-by: Thomas Hartmann ---- - .../designer/qquickdesignersupportproperties.cpp | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) - -diff --git a/src/quick/designer/qquickdesignersupportproperties.cpp b/src/quick/designer/qquickdesignersupportproperties.cpp -index 335795acf1..fb6a5fb324 100644 ---- a/src/quick/designer/qquickdesignersupportproperties.cpp -+++ b/src/quick/designer/qquickdesignersupportproperties.cpp -@@ -137,11 +137,8 @@ QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::propert - if (inspectedObjects == nullptr) - inspectedObjects = &localObjectList; - -- -- if (inspectedObjects->contains(object)) -- return propertyNameList; -- -- inspectedObjects->append(object); -+ if (!inspectedObjects->contains(object)) -+ inspectedObjects->append(object); - - const QMetaObject *metaObject = object->metaObject(); - for (int index = 0; index < metaObject->propertyCount(); ++index) { -@@ -194,12 +191,8 @@ QQuickDesignerSupport::PropertyNameList QQuickDesignerSupportProperties::allProp - if (inspectedObjects == nullptr) - inspectedObjects = &localObjectList; - -- -- if (inspectedObjects->contains(object)) -- return propertyNameList; -- -- inspectedObjects->append(object); -- -+ if (!inspectedObjects->contains(object)) -+ inspectedObjects->append(object); - - const QMetaObject *metaObject = object->metaObject(); - --- -2.31.1 - diff --git a/0021-QML-Fix-proxy-iteration.patch b/0021-QML-Fix-proxy-iteration.patch deleted file mode 100644 index a76b332..0000000 --- a/0021-QML-Fix-proxy-iteration.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5a7aa7881fa2c7abffb3d34a6b642fe4efcadbf4 Mon Sep 17 00:00:00 2001 -From: Fabian Kosmale -Date: Thu, 17 Dec 2020 11:22:34 +0100 -Subject: [PATCH 21/28] QML: Fix proxy iteration - -If the target of a proxy was extensible, we did not set the -iteratorTarget to its correct value, and thus the ForInIteratorObject -would not be usable. - -Fixes: QTBUG-86323 -Change-Id: Id1924ac4087bab38c006b8eba92b619b79d36b7a -Reviewed-by: Ulf Hermann -(cherry picked from commit dd740d6b3469448dc1fd31c1742781e923e9f274) ---- - src/qml/jsruntime/qv4proxy.cpp | 8 +++-- - .../qqmlecmascript/data/proxyIteration.qml | 29 +++++++++++++++++++ - .../qml/qqmlecmascript/tst_qqmlecmascript.cpp | 10 +++++++ - 3 files changed, 45 insertions(+), 2 deletions(-) - create mode 100644 tests/auto/qml/qqmlecmascript/data/proxyIteration.qml - -diff --git a/src/qml/jsruntime/qv4proxy.cpp b/src/qml/jsruntime/qv4proxy.cpp -index 1505eae426..8bfc9fc3ba 100644 ---- a/src/qml/jsruntime/qv4proxy.cpp -+++ b/src/qml/jsruntime/qv4proxy.cpp -@@ -624,8 +624,10 @@ OwnPropertyKeyIterator *ProxyObject::virtualOwnPropertyKeys(const Object *m, Val - else - targetNonConfigurableKeys->push_back(keyAsValue); - } -- if (target->isExtensible() && targetNonConfigurableKeys->getLength() == 0) -+ if (target->isExtensible() && targetNonConfigurableKeys->getLength() == 0) { -+ *iteratorTarget = *m; - return new ProxyObjectOwnPropertyKeyIterator(trapKeys); -+ } - - ScopedArrayObject uncheckedResultKeys(scope, scope.engine->newArrayObject()); - uncheckedResultKeys->copyArrayData(trapKeys); -@@ -639,8 +641,10 @@ OwnPropertyKeyIterator *ProxyObject::virtualOwnPropertyKeys(const Object *m, Val - } - } - -- if (target->isExtensible()) -+ if (target->isExtensible()) { -+ *iteratorTarget = *m; - return new ProxyObjectOwnPropertyKeyIterator(trapKeys); -+ } - - len = targetConfigurableKeys->getLength(); - for (uint i = 0; i < len; ++i) { -diff --git a/tests/auto/qml/qqmlecmascript/data/proxyIteration.qml b/tests/auto/qml/qqmlecmascript/data/proxyIteration.qml -new file mode 100644 -index 0000000000..affba7d9f1 ---- /dev/null -+++ b/tests/auto/qml/qqmlecmascript/data/proxyIteration.qml -@@ -0,0 +1,29 @@ -+import QtQml 2 -+ -+QtObject { -+ id: root -+ property int sum -+ Component.onCompleted: { -+ const target = { prop1: 1, prop2: 2, prop3: 3 }; -+ const handler = { -+ get: function(target, key) { -+ return target[key]+1; -+ }, -+ ownKeys: function() { -+ return ["prop1", "prop3"]; -+ }, -+ getOwnPropertyDescriptor: function(target, key) { -+ return { -+ value: this.get(target, key), -+ enumerable: true, -+ configurable: true -+ }; -+ } -+ }; -+ const proxy = new Proxy(target, handler); -+ for (var prop in proxy) { -+ root.sum += proxy[prop] // prop2 gets skipped, the values of 1 and 3 get incremented -+ } -+ // so root.sum should be 6 now -+ } -+} -diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp -index 3a9d1bfb4c..9198d3bebf 100644 ---- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp -+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp -@@ -382,6 +382,7 @@ private slots: - void semicolonAfterProperty(); - void hugeStack(); - void variantConversionMethod(); -+ void proxyIteration(); - void proxyHandlerTraps(); - void gcCrashRegressionTest(); - -@@ -9306,6 +9307,15 @@ void tst_qqmlecmascript::variantConversionMethod() - QCOMPARE(obj.funcCalled, QLatin1String("QModelIndex")); - } - -+void tst_qqmlecmascript::proxyIteration() -+{ -+ QQmlEngine engine; -+ QQmlComponent component(&engine, testFileUrl("proxyIteration.qml")); -+ QScopedPointer root(component.create()); -+ QVERIFY2(root != nullptr, qPrintable(component.errorString())); -+ QCOMPARE(root->property("sum").toInt(), 6); -+} -+ - void tst_qqmlecmascript::proxyHandlerTraps() - { - const QString expression = QStringLiteral(R"SNIPPET( --- -2.31.1 - diff --git a/0022-Fix-IC-properties-in-same-file.patch b/0022-Fix-IC-properties-in-same-file.patch deleted file mode 100644 index d19ea18..0000000 --- a/0022-Fix-IC-properties-in-same-file.patch +++ /dev/null @@ -1,146 +0,0 @@ -From bb0ce1ffd48aa69da03dc43bd314351519ebf0d7 Mon Sep 17 00:00:00 2001 -From: Fabian Kosmale -Date: Tue, 8 Dec 2020 14:12:47 +0100 -Subject: [PATCH 22/28] Fix IC properties in same file - -Also fixes typename and metatype registration for inline components. - -Done-with: Fabian Kosmale -Fixes: QTBUG-89173 -Change-Id: I97d65d5539b577a8828d5711e5f2e79c8568b441 -Reviewed-by: Fabian Kosmale -Reviewed-by: Ulf Hermann -(cherry picked from commit c2ca14ce22551ea72544b6e2b3a19823b6dc3050) ---- - src/qml/qml/qqmlpropertycachecreator.cpp | 9 +++++++ - src/qml/qml/qqmlpropertycachecreator_p.h | 2 ++ - src/qml/qml/qqmlpropertyvalidator.cpp | 25 +++++++++++++++++++ - src/qml/qml/qqmltypedata.cpp | 4 +-- - .../data/inlineComponentsSameFile.qml | 11 ++++++++ - .../qml/qqmllanguage/tst_qqmllanguage.cpp | 1 + - 6 files changed, 49 insertions(+), 3 deletions(-) - create mode 100644 tests/auto/qml/qqmllanguage/data/inlineComponentsSameFile.qml - -diff --git a/src/qml/qml/qqmlpropertycachecreator.cpp b/src/qml/qml/qqmlpropertycachecreator.cpp -index 36581bda4e..88d80d88ab 100644 ---- a/src/qml/qml/qqmlpropertycachecreator.cpp -+++ b/src/qml/qml/qqmlpropertycachecreator.cpp -@@ -90,6 +90,15 @@ QByteArray QQmlPropertyCacheCreatorBase::createClassNameTypeByUrl(const QUrl &ur - QByteArray::number(classIndexCounter.fetchAndAddRelaxed(1)); - } - -+QByteArray QQmlPropertyCacheCreatorBase::createClassNameForInlineComponent(const QUrl &baseUrl, int icId) -+{ -+ QByteArray baseName = createClassNameTypeByUrl(baseUrl); -+ if (baseName.isEmpty()) -+ baseName = QByteArray("ANON_QML_IC_") + QByteArray::number(classIndexCounter.fetchAndAddRelaxed(1)); -+ baseName += "_" + QByteArray::number(icId); -+ return baseName; -+} -+ - QQmlBindingInstantiationContext::QQmlBindingInstantiationContext(int referencingObjectIndex, const QV4::CompiledData::Binding *instantiatingBinding, - const QString &instantiatingPropertyName, QQmlPropertyCache *referencingObjectPropertyCache) - : referencingObjectIndex(referencingObjectIndex) -diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h -index 6b02d6fb98..77e3763a49 100644 ---- a/src/qml/qml/qqmlpropertycachecreator_p.h -+++ b/src/qml/qml/qqmlpropertycachecreator_p.h -@@ -104,6 +104,8 @@ public: - static int metaTypeForPropertyType(QV4::CompiledData::BuiltinType type); - - static QByteArray createClassNameTypeByUrl(const QUrl &url); -+ -+ static QByteArray createClassNameForInlineComponent(const QUrl &baseUrl, int icId); - }; - - template -diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp -index 3587609301..3a1f33113f 100644 ---- a/src/qml/qml/qqmlpropertyvalidator.cpp -+++ b/src/qml/qml/qqmlpropertyvalidator.cpp -@@ -651,6 +651,19 @@ bool QQmlPropertyValidator::canCoerce(int to, QQmlPropertyCache *fromMo) const - { - QQmlPropertyCache *toMo = enginePrivate->rawPropertyCacheForType(to); - -+ if (toMo == nullptr) { -+ // if we have an inline component from the current file, -+ // it is not properly registered at this point, as registration -+ // only occurs after the whole file has been validated -+ // Therefore we need to check the ICs here -+ for (const auto& icDatum : compilationUnit->inlineComponentData) { -+ if (icDatum.typeIds.id == to) { -+ toMo = compilationUnit->propertyCaches.at(icDatum.objectIndex); -+ break; -+ } -+ } -+ } -+ - while (fromMo) { - if (fromMo == toMo) - return true; -@@ -746,6 +759,18 @@ QQmlError QQmlPropertyValidator::validateObjectBinding(QQmlPropertyData *propert - // effect the properties on the type, but don't effect assignability - // Using -1 for the minor version ensures that we get the raw metaObject. - QQmlPropertyCache *propertyMetaObject = enginePrivate->rawPropertyCacheForType(propType, -1); -+ if (!propertyMetaObject) { -+ // if we have an inline component from the current file, -+ // it is not properly registered at this point, as registration -+ // only occurs after the whole file has been validated -+ // Therefore we need to check the ICs here -+ for (const auto& icDatum: compilationUnit->inlineComponentData) { -+ if (icDatum.typeIds.id == property->propType()) { -+ propertyMetaObject = compilationUnit->propertyCaches.at(icDatum.objectIndex); -+ break; -+ } -+ } -+ } - - if (propertyMetaObject) { - // Will be true if the assigned type inherits propertyMetaObject -diff --git a/src/qml/qml/qqmltypedata.cpp b/src/qml/qml/qqmltypedata.cpp -index fc1d0cfbcf..92a90ea677 100644 ---- a/src/qml/qml/qqmltypedata.cpp -+++ b/src/qml/qml/qqmltypedata.cpp -@@ -283,9 +283,7 @@ void setupICs(const ObjectContainer &container, QHash - for (int i = 0; i != container->objectCount(); ++i) { - auto root = container->objectAt(i); - for (auto it = root->inlineComponentsBegin(); it != root->inlineComponentsEnd(); ++it) { -- auto url = finalUrl; -- url.setFragment(QString::number(it->objectIndex)); -- const QByteArray &className = QQmlPropertyCacheCreatorBase::createClassNameTypeByUrl(url); -+ const QByteArray &className = QQmlPropertyCacheCreatorBase::createClassNameForInlineComponent(finalUrl, it->objectIndex); - InlineComponentData icDatum(QQmlMetaType::registerInternalCompositeType(className), int(it->objectIndex), int(it->nameIndex), 0, 0, 0); - icData->insert(it->objectIndex, icDatum); - } -diff --git a/tests/auto/qml/qqmllanguage/data/inlineComponentsSameFile.qml b/tests/auto/qml/qqmllanguage/data/inlineComponentsSameFile.qml -new file mode 100644 -index 0000000000..87cac10200 ---- /dev/null -+++ b/tests/auto/qml/qqmllanguage/data/inlineComponentsSameFile.qml -@@ -0,0 +1,11 @@ -+import QtQml 2.15 -+ -+QtObject { -+ component IC : QtObject { -+ property string name -+ property int age -+ } -+ -+ property IC other: IC { name: "Toby"; age: 30 } -+ property list listProp: [IC { name: "Alfred Ill"; age: 65 }, IC { name: "Claire Zachanassian"; age: 62}] -+} -diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp -index 8adcbc1837..e247a139ec 100644 ---- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp -+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp -@@ -5604,6 +5604,7 @@ void tst_qqmllanguage::inlineComponent_data() - QTest::newRow("Alias resolves correctly") << testFileUrl("inlineComponentWithAlias.qml") << QColorConstants::Svg::lime << 42 << true; - - QTest::newRow("Two inline components in same do not crash (QTBUG-86989)") << testFileUrl("twoInlineComponents.qml") << QColor() << 0 << false; -+ QTest::newRow("Inline components used in same file (QTBUG-89173)") << testFileUrl("inlineComponentsSameFile.qml") << QColor() << 0 << false; - } - - void tst_qqmllanguage::inlineComponentReferenceCycle_data() --- -2.31.1 - diff --git a/0023-JIT-When-making-memory-writable-include-the-exceptio.patch b/0023-JIT-When-making-memory-writable-include-the-exceptio.patch deleted file mode 100644 index e6b3ac3..0000000 --- a/0023-JIT-When-making-memory-writable-include-the-exceptio.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 35614462443c100b6753b335b58a134fed4b5c35 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -Date: Wed, 16 Dec 2020 16:45:36 +0100 -Subject: [PATCH 23/28] JIT: When making memory writable, include the exception - handler - -makeWritable() rounds the memory down to the next page boundary. Usually -we include the exception handler this way, unless the offset from the -page boundary is less than the exception handler size. Make it explicit -that we do want the exception handler to be writable, too. - -Fixes: QTBUG-89513 -Change-Id: I2fb8fb0e1dcc3450b036924463dc1b40d2020c46 -Reviewed-by: Fabian Kosmale -(cherry picked from commit 86a595b126bc6794380dc00af80ec4802f7d058c) -Reviewed-by: Qt Cherry-pick Bot ---- - src/3rdparty/masm/assembler/AssemblerBuffer.h | 4 ++-- - src/3rdparty/masm/assembler/LinkBuffer.h | 9 +++++---- - .../masm/assembler/MacroAssemblerCodeRef.h | 6 +++--- - src/3rdparty/masm/stubs/ExecutableAllocator.h | 11 ++++++++--- - src/qml/jsruntime/qv4executableallocator.cpp | 14 ++++++++++++-- - src/qml/jsruntime/qv4executableallocator_p.h | 10 ++++++++-- - src/qml/jsruntime/qv4functiontable_win64.cpp | 4 ++-- - 7 files changed, 40 insertions(+), 18 deletions(-) - -diff --git a/src/3rdparty/masm/assembler/AssemblerBuffer.h b/src/3rdparty/masm/assembler/AssemblerBuffer.h -index 45874235b6..2292a4c244 100644 ---- a/src/3rdparty/masm/assembler/AssemblerBuffer.h -+++ b/src/3rdparty/masm/assembler/AssemblerBuffer.h -@@ -140,9 +140,9 @@ namespace JSC { - if (!result) - return 0; - -- ExecutableAllocator::makeWritable(result->start(), result->sizeInBytes()); -+ ExecutableAllocator::makeWritable(result->memoryStart(), result->memorySize()); - -- memcpy(result->start(), m_buffer, m_index); -+ memcpy(result->codeStart(), m_buffer, m_index); - - return result.release(); - } -diff --git a/src/3rdparty/masm/assembler/LinkBuffer.h b/src/3rdparty/masm/assembler/LinkBuffer.h -index ba57564a1d..fa669deaf9 100644 ---- a/src/3rdparty/masm/assembler/LinkBuffer.h -+++ b/src/3rdparty/masm/assembler/LinkBuffer.h -@@ -333,7 +333,7 @@ inline void LinkBufferBase::linkCode - m_executableMemory = m_assembler->m_assembler.executableCopy(*m_globalData, ownerUID, effort); - if (!m_executableMemory) - return; -- m_code = m_executableMemory->start(); -+ m_code = m_executableMemory->codeStart(); - m_size = m_assembler->m_assembler.codeSize(); - ASSERT(m_code); - } -@@ -355,7 +355,8 @@ void LinkBufferBase::performFinaliza - template class ExecutableOffsetCalculator> - inline void LinkBufferBase::makeExecutable() - { -- ExecutableAllocator::makeExecutable(code(), static_cast(m_size)); -+ ExecutableAllocator::makeExecutable(m_executableMemory->memoryStart(), -+ m_executableMemory->memorySize()); - } - - template -@@ -442,9 +443,9 @@ inline void BranchCompactingLinkBuffer::linkCode(void* ownerUID, - m_executableMemory = m_globalData->executableAllocator.allocate(*m_globalData, m_initialSize, ownerUID, effort); - if (!m_executableMemory) - return; -- m_code = (uint8_t*)m_executableMemory->start(); -+ m_code = (uint8_t*)m_executableMemory->codeStart(); - ASSERT(m_code); -- ExecutableAllocator::makeWritable(m_code, m_initialSize); -+ ExecutableAllocator::makeWritable(m_executableMemory->memoryStart(), m_executableMemory->memorySize()); - uint8_t* inData = (uint8_t*)m_assembler->unlinkedCode(); - uint8_t* outData = reinterpret_cast(m_code); - int readPtr = 0; -diff --git a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h -index a7e78ad78f..cde9751108 100644 ---- a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h -+++ b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h -@@ -357,11 +357,11 @@ public: - } - - MacroAssemblerCodeRef(PassRefPtr executableMemory) -- : m_codePtr(executableMemory->start()) -+ : m_codePtr(executableMemory->codeStart()) - , m_executableMemory(executableMemory) - { - ASSERT(m_executableMemory->isManaged()); -- ASSERT(m_executableMemory->start()); -+ ASSERT(m_executableMemory->codeStart()); - ASSERT(m_codePtr); - } - -@@ -395,7 +395,7 @@ public: - { - if (!m_executableMemory) - return 0; -- return m_executableMemory->sizeInBytes(); -+ return m_executableMemory->codeSize(); - } - - bool tryToDisassemble(const char* prefix) const -diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h -index a439c53827..f984704023 100644 ---- a/src/3rdparty/masm/stubs/ExecutableAllocator.h -+++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h -@@ -82,9 +82,14 @@ struct ExecutableMemoryHandle : public RefCounted { - - inline bool isManaged() const { return true; } - -- void *exceptionHandler() { return m_allocation->exceptionHandler(); } -- void *start() { return m_allocation->start(); } -- size_t sizeInBytes() { return m_size; } -+ void *memoryStart() { return m_allocation->memoryStart(); } -+ size_t memorySize() { return m_allocation->memorySize(); } -+ -+ void *exceptionHandlerStart() { return m_allocation->exceptionHandlerStart(); } -+ size_t exceptionHandlerSize() { return m_allocation->exceptionHandlerSize(); } -+ -+ void *codeStart() { return m_allocation->codeStart(); } -+ size_t codeSize() { return m_size; } - - QV4::ExecutableAllocator::ChunkOfPages *chunk() const - { return m_allocator->chunkForAllocation(m_allocation); } -diff --git a/src/qml/jsruntime/qv4executableallocator.cpp b/src/qml/jsruntime/qv4executableallocator.cpp -index 7ee6f39aa2..c06773d3c5 100644 ---- a/src/qml/jsruntime/qv4executableallocator.cpp -+++ b/src/qml/jsruntime/qv4executableallocator.cpp -@@ -45,12 +45,22 @@ - - using namespace QV4; - --void *ExecutableAllocator::Allocation::exceptionHandler() const -+void *ExecutableAllocator::Allocation::exceptionHandlerStart() const - { - return reinterpret_cast(addr); - } - --void *ExecutableAllocator::Allocation::start() const -+size_t ExecutableAllocator::Allocation::exceptionHandlerSize() const -+{ -+ return QV4::exceptionHandlerSize(); -+} -+ -+void *ExecutableAllocator::Allocation::memoryStart() const -+{ -+ return reinterpret_cast(addr); -+} -+ -+void *ExecutableAllocator::Allocation::codeStart() const - { - return reinterpret_cast(addr + exceptionHandlerSize()); - } -diff --git a/src/qml/jsruntime/qv4executableallocator_p.h b/src/qml/jsruntime/qv4executableallocator_p.h -index f98f2c7d33..4735fb151f 100644 ---- a/src/qml/jsruntime/qv4executableallocator_p.h -+++ b/src/qml/jsruntime/qv4executableallocator_p.h -@@ -86,8 +86,14 @@ public: - , free(true) - {} - -- void *exceptionHandler() const; -- void *start() const; -+ void *memoryStart() const; -+ size_t memorySize() const { return size; } -+ -+ void *exceptionHandlerStart() const; -+ size_t exceptionHandlerSize() const; -+ -+ void *codeStart() const; -+ - void invalidate() { addr = 0; } - bool isValid() const { return addr != 0; } - void deallocate(ExecutableAllocator *allocator); -diff --git a/src/qml/jsruntime/qv4functiontable_win64.cpp b/src/qml/jsruntime/qv4functiontable_win64.cpp -index fc13dc2602..0cb98641cd 100644 ---- a/src/qml/jsruntime/qv4functiontable_win64.cpp -+++ b/src/qml/jsruntime/qv4functiontable_win64.cpp -@@ -106,7 +106,7 @@ struct ExceptionHandlerRecord - void generateFunctionTable(Function *, JSC::MacroAssemblerCodeRef *codeRef) - { - ExceptionHandlerRecord *record = reinterpret_cast( -- codeRef->executableMemory()->exceptionHandler()); -+ codeRef->executableMemory()->exceptionHandlerStart()); - - record->info.Version = 1; - record->info.Flags = 0; -@@ -136,7 +136,7 @@ void generateFunctionTable(Function *, JSC::MacroAssemblerCodeRef *codeRef) - void destroyFunctionTable(Function *, JSC::MacroAssemblerCodeRef *codeRef) - { - ExceptionHandlerRecord *record = reinterpret_cast( -- codeRef->executableMemory()->exceptionHandler()); -+ codeRef->executableMemory()->exceptionHandlerStart()); - if (!RtlDeleteFunctionTable(&record->handler)) { - const unsigned int errorCode = GetLastError(); - qWarning() << "Failed to remove win64 unwind hook. Error code:" << errorCode; --- -2.31.1 - diff --git a/0024-doc-explain-QQItem-event-delivery-handlers-setAccept.patch b/0024-doc-explain-QQItem-event-delivery-handlers-setAccept.patch deleted file mode 100644 index 7cf5ef6..0000000 --- a/0024-doc-explain-QQItem-event-delivery-handlers-setAccept.patch +++ /dev/null @@ -1,103 +0,0 @@ -From e203a185cfab199a89a33b903096d6d0023a8a88 Mon Sep 17 00:00:00 2001 -From: Shawn Rutledge -Date: Wed, 30 Sep 2020 13:51:59 +0200 -Subject: [PATCH 24/28] doc: explain QQItem event delivery, handlers, - setAcceptTouchEvents() - -We quietly recommended calling setAcceptTouchEvents() in the Qt 5.10 -release notes in any Item subclass that wants to receive touch events, -and in the docs for setAcceptTouchEvents() itself; but the message about -the impending behavior change might not have been obvious enough. -In Qt 6 it becomes mandatory, so clearer docs will hopefully help to -stave off bogus bug reports. - -We also never had a great overview of event handling from an Item's -perspective; now it's a little better. - -Followup to ab91e7fa02a562d80fd0747f28a60e00c3b45a01 and -a97759a336c597327cb82eebc9f45c793aec32c9 - -[ChangeLog][QtQuick][QQuickItem] When subclassing QQuickItem, you -should call setAcceptTouchEvents(true) if you need the item to receive -touch events. It will be required in Qt 6. - -Task-number: QTBUG-87018 -Task-number: QTBUG-87082 -Change-Id: I1c7a43979e3665778d61949c9d37c1d085ed594b -Reviewed-by: Volker Hilsheimer -(cherry picked from commit 7c648280bb53c4276ba4ae2abf26d070fedde71a) -Reviewed-by: Shawn Rutledge ---- - src/quick/items/qquickitem.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp -index ddd67522b9..e02df00595 100644 ---- a/src/quick/items/qquickitem.cpp -+++ b/src/quick/items/qquickitem.cpp -@@ -1,9 +1,9 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** 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. -+** This file is part of the QtQuick module of the Qt Toolkit.fset - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** Commercial License Usage -@@ -1883,7 +1883,23 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus) - \endqml - - -- \section2 Key Handling -+ \section2 Event Handling -+ -+ All Item-based visual types can use \l {Qt Quick Input Handlers}{Input Handlers} -+ to handle incoming input events (subclasses of QInputEvent), such as mouse, -+ touch and key events. This is the preferred declarative way to handle events. -+ -+ An alternative way to handle touch events is to subclass QQuickItem, call -+ setAcceptTouchEvents() in the constructor, and override touchEvent(). -+ \l {QEvent::setAccepted()}{Accept} the entire event to stop delivery to -+ items underneath, and to exclusively grab all the event's touch points. -+ -+ Likewise, a QQuickItem subclass can call setAcceptedMouseButtons() -+ to register to receive mouse button events, setAcceptHoverEvents() -+ to receive hover events (mouse movements while no button is pressed), -+ and override the virtual functions mousePressEvent(), mouseMoveEvent(), and -+ mouseReleaseEvent(). Those can also accept the event to prevent further -+ delivery and get an implicit grab at the same time. - - Key handling is available to all Item-based visual types via the \l Keys - attached property. The \e Keys attached property provides basic signals -@@ -7301,7 +7317,9 @@ bool QQuickItem::isAncestorOf(const QQuickItem *child) const - If an item does not accept the mouse button for a particular mouse event, - the mouse event will not be delivered to the item and will be delivered - to the next item in the item hierarchy instead. -- */ -+ -+ \sa acceptTouchEvents() -+*/ - Qt::MouseButtons QQuickItem::acceptedMouseButtons() const - { - Q_D(const QQuickItem); -@@ -7310,7 +7328,13 @@ Qt::MouseButtons QQuickItem::acceptedMouseButtons() const - - /*! - Sets the mouse buttons accepted by this item to \a buttons. -- */ -+ -+ \note In Qt 5, calling setAcceptedMouseButtons() implicitly caused -+ an item to receive touch events as well as mouse events; but it was -+ recommended to call setAcceptTouchEvents() to subscribe for them. -+ In Qt 6, it is necessary to call setAcceptTouchEvents() to continue -+ to receive them. -+*/ - void QQuickItem::setAcceptedMouseButtons(Qt::MouseButtons buttons) - { - Q_D(QQuickItem); --- -2.31.1 - diff --git a/0025-Give-a-warning-when-StyledText-encounters-a-non-supp.patch b/0025-Give-a-warning-when-StyledText-encounters-a-non-supp.patch deleted file mode 100644 index d431db8..0000000 --- a/0025-Give-a-warning-when-StyledText-encounters-a-non-supp.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6d7dfed857ab9e83ab2a917a929ce3b25342d90a Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Fri, 21 May 2021 13:30:41 +0200 -Subject: [PATCH 25/28] Give a warning when StyledText encounters a non - supported entity - -Pick-to: 6.1 5.15 -Change-Id: Iea8bdf25542cd404ee71141467ac1f1398a7d0df -Reviewed-by: Fabian Kosmale -(cherry picked from commit 8cd43e370040e23fcbd03ad64969e683055bd7d0) ---- - src/quick/util/qquickstyledtext.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp -index 660852ba83..d531fc9205 100644 ---- a/src/quick/util/qquickstyledtext.cpp -+++ b/src/quick/util/qquickstyledtext.cpp -@@ -46,6 +46,8 @@ - #include "qquickstyledtext_p.h" - #include - -+Q_LOGGING_CATEGORY(lcStyledText, "qt.quick.styledtext") -+ - /* - QQuickStyledText supports few tags: - -@@ -566,6 +568,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI - textOut += QChar(34); - else if (entity == QLatin1String("nbsp")) - textOut += QChar(QChar::Nbsp); -+ else -+ qCWarning(lcStyledText) << "StyledText doesn't support entity" << entity; - return; - } else if (*ch == QLatin1Char(' ')) { - QStringRef entity(&textIn, entityStart - 1, entityLength + 1); --- -2.31.1 - diff --git a/0026-Add-missing-limits-include-to-fix-build-with-GCC-11.patch b/0026-Add-missing-limits-include-to-fix-build-with-GCC-11.patch deleted file mode 100644 index 3fab284..0000000 --- a/0026-Add-missing-limits-include-to-fix-build-with-GCC-11.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4f08a2da5b0da675cf6a75683a43a106f5a1e7b8 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Sun, 23 May 2021 14:32:46 +0200 -Subject: [PATCH 26/28] Add missing limits include to fix build with GCC 11 - -This is not required for Qt 6, since it is indirectly pulled via -qanystrigview.h, but it is for Qt 5 (where qanystrigview does -not exist) and, in any case, it is good to declare all used headers -and not rely on them being implicitly pulled. - -Pick-to: 6.1 5.15 -Change-Id: I97606ea493e723006759608b7d4c4f00632f340c -Reviewed-by: Albert Astals Cid -(cherry picked from commit 367293b18ab0d0a0432c1c8ce445fee052e5eee5) ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.31.1 - diff --git a/0030-Include-limits-in-Yarr.h-to-fix-build-with-GCC-11.patch b/0030-Include-limits-in-Yarr.h-to-fix-build-with-GCC-11.patch deleted file mode 100644 index e49faf3..0000000 --- a/0030-Include-limits-in-Yarr.h-to-fix-build-with-GCC-11.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 92225b72b9ca6b1efc9bc7bb0c12dd7487e900a7 Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Wed, 18 Aug 2021 22:50:29 +0300 -Subject: [PATCH 30/36] Include in Yarr.h to fix build with GCC 11 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- (aka ) is needed for UINT_MAX macro constant. -- is needed for std::numeric_limits. - -Without this fix, qtdeclarative failed to build on some platforms: - - In file included from jsruntime/qv4regexp_p.h:62, - from jsruntime/qv4regexp.cpp:40: - ../3rdparty/masm/yarr/Yarr.h:46:44: error: ‘numeric_limits’ is not a member of ‘std’ - 46 | static const unsigned offsetNoMatch = std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - -Pick-to: 5.15 6.2 -Change-Id: I7cc9f7bc6624a52c8659f09034ab16064da5fd2f -Reviewed-by: Albert Astals Cid -Reviewed-by: Ulf Hermann -(cherry picked from commit db58b8518e157b765bf2e01e6382a9eed4751f27) ---- - src/3rdparty/masm/yarr/Yarr.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h -index ccf78f9880..2955ea7e72 100644 ---- a/src/3rdparty/masm/yarr/Yarr.h -+++ b/src/3rdparty/masm/yarr/Yarr.h -@@ -28,6 +28,7 @@ - #pragma once - - #include -+#include - #include "YarrErrorCode.h" - - namespace JSC { namespace Yarr { --- -2.31.1 - diff --git a/0031-QQuickLoader-Do-not-incubate-if-the-source-arrives-a.patch b/0031-QQuickLoader-Do-not-incubate-if-the-source-arrives-a.patch deleted file mode 100644 index 8f9ef46..0000000 --- a/0031-QQuickLoader-Do-not-incubate-if-the-source-arrives-a.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 1c33a9d045897ce755a818ebff7ddecae97885d3 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Tue, 21 Sep 2021 00:10:26 +0200 -Subject: [PATCH 31/36] QQuickLoader: Do not incubate if the source arrives - after setActive(false) - -Otherwise we end up in the crazy place of active being false but item -being non-null and forces us to workaround within the apps. - -Change-Id: I88c27c4b00ccec8b8e0c05a8e10b44fcabfc2e30 -Reviewed-by: Ulf Hermann -(cherry picked from commit e78c068700fa74ab3aca6a23ab2450563b1c3a5c) -Reviewed-by: Qt Cherry-pick Bot ---- - src/quick/items/qquickloader.cpp | 3 +++ - .../data/loader-async-race-rect.qml | 10 ++++++++++ - .../qquickloader/data/loader-async-race.qml | 14 ++++++++++++++ - .../quick/qquickloader/tst_qquickloader.cpp | 19 +++++++++++++++++++ - 4 files changed, 46 insertions(+) - create mode 100644 tests/auto/quick/qquickloader/data/loader-async-race-rect.qml - create mode 100644 tests/auto/quick/qquickloader/data/loader-async-race.qml - -diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp -index 8cd63a4236..a6f7009946 100644 ---- a/src/quick/items/qquickloader.cpp -+++ b/src/quick/items/qquickloader.cpp -@@ -738,6 +738,9 @@ void QQuickLoaderPrivate::_q_sourceLoaded() - return; - } - -+ if (!active) -+ return; -+ - QQmlContext *creationContext = component->creationContext(); - if (!creationContext) creationContext = qmlContext(q); - itemContext = new QQmlContext(creationContext); -diff --git a/tests/auto/quick/qquickloader/data/loader-async-race-rect.qml b/tests/auto/quick/qquickloader/data/loader-async-race-rect.qml -new file mode 100644 -index 0000000000..a56dcea5ad ---- /dev/null -+++ b/tests/auto/quick/qquickloader/data/loader-async-race-rect.qml -@@ -0,0 +1,10 @@ -+import QtQuick 2.15 -+ -+Rectangle { -+ anchors.fill: parent -+ color: "blue" -+ Item { -+ Item { -+ } -+ } -+} -diff --git a/tests/auto/quick/qquickloader/data/loader-async-race.qml b/tests/auto/quick/qquickloader/data/loader-async-race.qml -new file mode 100644 -index 0000000000..8ba625c5c1 ---- /dev/null -+++ b/tests/auto/quick/qquickloader/data/loader-async-race.qml -@@ -0,0 +1,14 @@ -+import QtQuick 2.15 -+ -+Item { -+ id: root -+ Component.onCompleted: { -+ myloader.active = false -+ } -+ Loader { -+ id: myloader -+ anchors.fill: parent -+ asynchronous: true -+ source: "loader-async-race-rect.qml" -+ } -+} -diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp -index f4b682f3f4..fe2d71b037 100644 ---- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp -+++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp -@@ -132,6 +132,7 @@ private slots: - void statusChangeOnlyEmittedOnce(); - - void setSourceAndCheckStatus(); -+ void asyncLoaderRace(); - }; - - Q_DECLARE_METATYPE(QList) -@@ -1491,6 +1492,24 @@ void tst_QQuickLoader::setSourceAndCheckStatus() - QCOMPARE(loader->status(), QQuickLoader::Null); - } - -+void tst_QQuickLoader::asyncLoaderRace() -+{ -+ QQmlApplicationEngine engine; -+ auto url = testFileUrl("loader-async-race.qml"); -+ engine.load(url); -+ auto root = engine.rootObjects().at(0); -+ QVERIFY(root); -+ -+ QQuickLoader *loader = root->findChild(); -+ QCOMPARE(loader->active(), false); -+ QCOMPARE(loader->status(), QQuickLoader::Null); -+ QCOMPARE(loader->item(), nullptr); -+ -+ QSignalSpy spy(loader, &QQuickLoader::itemChanged); -+ QVERIFY(!spy.wait(100)); -+ QCOMPARE(loader->item(), nullptr); -+} -+ - QTEST_MAIN(tst_QQuickLoader) - - #include "tst_qquickloader.moc" --- -2.31.1 - diff --git a/0034-Fix-distorted-text-with-subpixel-matrix-translation.patch b/0034-Fix-distorted-text-with-subpixel-matrix-translation.patch deleted file mode 100644 index bcec926..0000000 --- a/0034-Fix-distorted-text-with-subpixel-matrix-translation.patch +++ /dev/null @@ -1,483 +0,0 @@ -From c1ddd97c87c729c7d05c7a74f82d41cfc5bd9cf8 Mon Sep 17 00:00:00 2001 -From: Eskil Abrahamsen Blomfeldt -Date: Tue, 12 Oct 2021 13:13:01 +0200 -Subject: [PATCH 34/36] Fix distorted text with subpixel matrix translation - -We would pixel-align native text *before* applying the -model-view matrix, which would cause GL_NEAREST artifacts to -show up when the text was positioned at a subpixel offset in -some cases. Instead, we pixel-align the coordinates after mapping -them to the view frustum, but before applying the projection to the -screen. - -To make it easier to modify the buffer layout for the shaders the -next time, this also adds some constants for offsets. - -[ChangeLog][Text] Fixed an issue where text using NativeRendering -would look slightly skewed if it was inside a parent that had -been positioned at a subpixel offset. - -Pick-to: 5.15 6.2 -Fixes: QTBUG-96112 -Fixes: QTBUG-83626 -Task-number: QTBUG-55638 -Change-Id: Ifb785ad5830093df94afc75a7bc288e24ca7aa38 -Reviewed-by: Eirik Aavitsland -(cherry picked from commit b21948f5e811ce1b7abf065bc48af61a231e86f4) ---- - .../scenegraph/qsgdefaultglyphnode_p.cpp | 46 ++++++---- - .../scenegraph/shaders_ng/24bittextmask.frag | 5 +- - .../scenegraph/shaders_ng/32bitcolortext.frag | 5 +- - .../scenegraph/shaders_ng/8bittextmask.frag | 3 +- - .../scenegraph/shaders_ng/8bittextmask_a.frag | 3 +- - .../scenegraph/shaders_ng/outlinedtext.frag | 5 +- - .../scenegraph/shaders_ng/outlinedtext.vert | 9 +- - .../scenegraph/shaders_ng/outlinedtext_a.frag | 5 +- - .../scenegraph/shaders_ng/styledtext.frag | 3 +- - .../scenegraph/shaders_ng/styledtext.vert | 7 +- - .../scenegraph/shaders_ng/styledtext_a.frag | 3 +- - src/quick/scenegraph/shaders_ng/textmask.frag | 3 +- - src/quick/scenegraph/shaders_ng/textmask.vert | 7 +- - ...text_nativerendering_subpixelpositions.qml | 91 +++++++++++++++++++ - 14 files changed, 155 insertions(+), 40 deletions(-) - create mode 100644 tests/manual/scenegraph_lancelot/data/text/text_nativerendering_subpixelpositions.qml - -diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -index 3c60f830de..0fd6581dc4 100644 ---- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -@@ -428,6 +428,18 @@ QSGTextMaskRhiShader::QSGTextMaskRhiShader(QFontEngine::GlyphFormat glyphFormat) - QStringLiteral(":/qt-project.org/scenegraph/shaders_ng/textmask.frag.qsb")); - } - -+enum UbufOffset { -+ ModelViewMatrixOffset = 0, -+ ProjectionMatrixOffset = ModelViewMatrixOffset + 64, -+ ColorOffset = ProjectionMatrixOffset + 64, -+ TextureScaleOffset = ColorOffset + 16, -+ DprOffset = TextureScaleOffset + 8, -+ -+ // + 1 float padding (vec4 must be aligned to 16) -+ StyleColorOffset = DprOffset + 4 + 4, -+ ShiftOffset = StyleColorOffset + 16 -+}; -+ - bool QSGTextMaskRhiShader::updateUniformData(RenderState &state, - QSGMaterial *newMaterial, QSGMaterial *oldMaterial) - { -@@ -443,11 +455,14 @@ bool QSGTextMaskRhiShader::updateUniformData(RenderState &state, - - bool changed = false; - QByteArray *buf = state.uniformData(); -- Q_ASSERT(buf->size() >= 92); -+ Q_ASSERT(buf->size() >= DprOffset + 4); - - if (state.isMatrixDirty()) { -- const QMatrix4x4 m = state.combinedMatrix(); -- memcpy(buf->data(), m.constData(), 64); -+ const QMatrix4x4 mv = state.modelViewMatrix(); -+ memcpy(buf->data() + ModelViewMatrixOffset, mv.constData(), 64); -+ const QMatrix4x4 p = state.projectionMatrix(); -+ memcpy(buf->data() + ProjectionMatrixOffset, p.constData(), 64); -+ - changed = true; - } - -@@ -456,13 +471,13 @@ bool QSGTextMaskRhiShader::updateUniformData(RenderState &state, - if (updated || !oldMat || oldRtex != newRtex) { - const QVector2D textureScale = QVector2D(1.0f / mat->rhiGlyphCache()->width(), - 1.0f / mat->rhiGlyphCache()->height()); -- memcpy(buf->data() + 64 + 16, &textureScale, 8); -+ memcpy(buf->data() + TextureScaleOffset, &textureScale, 8); - changed = true; - } - - if (!oldMat) { - float dpr = state.devicePixelRatio(); -- memcpy(buf->data() + 64 + 16 + 8, &dpr, 4); -+ memcpy(buf->data() + DprOffset, &dpr, 4); - } - - // move texture uploads/copies onto the renderer's soon-to-be-committed list -@@ -510,11 +525,11 @@ bool QSG8BitTextMaskRhiShader::updateUniformData(RenderState &state, - QSGTextMaskMaterial *oldMat = static_cast(oldMaterial); - - QByteArray *buf = state.uniformData(); -- Q_ASSERT(buf->size() >= 80); -+ Q_ASSERT(buf->size() >= ColorOffset + 16); - - if (oldMat == nullptr || mat->color() != oldMat->color() || state.isOpacityDirty()) { - const QVector4D color = qsg_premultiply(mat->color(), state.opacity()); -- memcpy(buf->data() + 64, &color, 16); -+ memcpy(buf->data() + ColorOffset, &color, 16); - changed = true; - } - -@@ -553,12 +568,12 @@ bool QSG24BitTextMaskRhiShader::updateUniformData(RenderState &state, - QSGTextMaskMaterial *oldMat = static_cast(oldMaterial); - - QByteArray *buf = state.uniformData(); -- Q_ASSERT(buf->size() >= 92); -+ Q_ASSERT(buf->size() >= ColorOffset + 16); - - if (oldMat == nullptr || mat->color() != oldMat->color() || state.isOpacityDirty()) { - // shader takes vec4 but uses alpha only; coloring happens via the blend constant - const QVector4D color = qsg_premultiply(mat->color(), state.opacity()); -- memcpy(buf->data() + 64, &color, 16); -+ memcpy(buf->data() + ColorOffset, &color, 16); - changed = true; - } - -@@ -608,12 +623,12 @@ bool QSG32BitColorTextRhiShader::updateUniformData(RenderState &state, - QSGTextMaskMaterial *oldMat = static_cast(oldMaterial); - - QByteArray *buf = state.uniformData(); -- Q_ASSERT(buf->size() >= 92); -+ Q_ASSERT(buf->size() >= ColorOffset + 16); - - if (oldMat == nullptr || mat->color() != oldMat->color() || state.isOpacityDirty()) { - // shader takes vec4 but uses alpha only - const QVector4D color(0, 0, 0, mat->color().w() * state.opacity()); -- memcpy(buf->data() + 64, &color, 16); -+ memcpy(buf->data() + ColorOffset, &color, 16); - changed = true; - } - -@@ -649,20 +664,17 @@ bool QSGStyledTextRhiShader::updateUniformData(RenderState &state, - QSGStyledTextMaterial *oldMat = static_cast(oldMaterial); - - QByteArray *buf = state.uniformData(); -- Q_ASSERT(buf->size() >= 120); -- -- // matrix..dpr + 1 float padding (vec4 must be aligned to 16) -- const int startOffset = 64 + 16 + 8 + 4 + 4; -+ Q_ASSERT(buf->size() >= ShiftOffset + 8); - - if (oldMat == nullptr || mat->styleColor() != oldMat->styleColor() || state.isOpacityDirty()) { - const QVector4D styleColor = qsg_premultiply(mat->styleColor(), state.opacity()); -- memcpy(buf->data() + startOffset, &styleColor, 16); -+ memcpy(buf->data() + StyleColorOffset, &styleColor, 16); - changed = true; - } - - if (oldMat == nullptr || oldMat->styleShift() != mat->styleShift()) { - const QVector2D v = mat->styleShift(); -- memcpy(buf->data() + startOffset + 16, &v, 8); -+ memcpy(buf->data() + ShiftOffset, &v, 8); - changed = true; - } - -diff --git a/src/quick/scenegraph/shaders_ng/24bittextmask.frag b/src/quick/scenegraph/shaders_ng/24bittextmask.frag -index bc3826a924..ed8da4cd30 100644 ---- a/src/quick/scenegraph/shaders_ng/24bittextmask.frag -+++ b/src/quick/scenegraph/shaders_ng/24bittextmask.frag -@@ -6,8 +6,9 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -- vec4 color; // only alpha is used, but must be vec4 due to layout compat -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; -+ vec4 color; - vec2 textureScale; - float dpr; - } ubuf; -diff --git a/src/quick/scenegraph/shaders_ng/32bitcolortext.frag b/src/quick/scenegraph/shaders_ng/32bitcolortext.frag -index 63e445f90b..4198a4d339 100644 ---- a/src/quick/scenegraph/shaders_ng/32bitcolortext.frag -+++ b/src/quick/scenegraph/shaders_ng/32bitcolortext.frag -@@ -6,8 +6,9 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -- vec4 color; // only alpha is used, but must be vec4 due to layout compat -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; -+ vec4 color; - vec2 textureScale; - float dpr; - } ubuf; -diff --git a/src/quick/scenegraph/shaders_ng/8bittextmask.frag b/src/quick/scenegraph/shaders_ng/8bittextmask.frag -index 6304e821ff..a06743876d 100644 ---- a/src/quick/scenegraph/shaders_ng/8bittextmask.frag -+++ b/src/quick/scenegraph/shaders_ng/8bittextmask.frag -@@ -6,7 +6,8 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -diff --git a/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag b/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag -index 0d0fa1cd3a..f725cbc5e7 100644 ---- a/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag -+++ b/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag -@@ -6,7 +6,8 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext.frag b/src/quick/scenegraph/shaders_ng/outlinedtext.frag -index 947d161a50..e2f82d3845 100644 ---- a/src/quick/scenegraph/shaders_ng/outlinedtext.frag -+++ b/src/quick/scenegraph/shaders_ng/outlinedtext.frag -@@ -11,11 +11,12 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- // must match styledtext -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -+ // the above must stay compatible with textmask/8bittextmask - vec4 styleColor; - vec2 shift; - } ubuf; -diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext.vert b/src/quick/scenegraph/shaders_ng/outlinedtext.vert -index 023f9dfdc2..4068e42f28 100644 ---- a/src/quick/scenegraph/shaders_ng/outlinedtext.vert -+++ b/src/quick/scenegraph/shaders_ng/outlinedtext.vert -@@ -10,11 +10,12 @@ layout(location = 3) out vec2 sCoordLeft; - layout(location = 4) out vec2 sCoordRight; - - layout(std140, binding = 0) uniform buf { -- // must match styledtext -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -+ // the above must stay compatible with textmask/8bittextmask - vec4 styleColor; - vec2 shift; - } ubuf; -@@ -28,6 +29,6 @@ void main() - sCoordDown = (tCoord - vec2(0.0, 1.0)) * ubuf.textureScale; - sCoordLeft = (tCoord - vec2(-1.0, 0.0)) * ubuf.textureScale; - sCoordRight = (tCoord - vec2(1.0, 0.0)) * ubuf.textureScale; -- vec3 dprSnapPos = floor(vCoord.xyz * ubuf.dpr + 0.5) / ubuf.dpr; -- gl_Position = ubuf.matrix * vec4(dprSnapPos, vCoord.w); -+ vec4 xformed = ubuf.modelViewMatrix * vCoord; -+ gl_Position = ubuf.projectionMatrix * vec4(floor(xformed.xyz * ubuf.dpr + 0.5) / ubuf.dpr, xformed.w); - } -diff --git a/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag b/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag -index 5b7bd9ca82..274d891a3c 100644 ---- a/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag -+++ b/src/quick/scenegraph/shaders_ng/outlinedtext_a.frag -@@ -11,11 +11,12 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- // must match styledtext -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -+ // the above must stay compatible with textmask/8bittextmask - vec4 styleColor; - vec2 shift; - } ubuf; -diff --git a/src/quick/scenegraph/shaders_ng/styledtext.frag b/src/quick/scenegraph/shaders_ng/styledtext.frag -index 0b16396037..2e380dfeae 100644 ---- a/src/quick/scenegraph/shaders_ng/styledtext.frag -+++ b/src/quick/scenegraph/shaders_ng/styledtext.frag -@@ -8,7 +8,8 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -diff --git a/src/quick/scenegraph/shaders_ng/styledtext.vert b/src/quick/scenegraph/shaders_ng/styledtext.vert -index beadf07c79..271dae8d8a 100644 ---- a/src/quick/scenegraph/shaders_ng/styledtext.vert -+++ b/src/quick/scenegraph/shaders_ng/styledtext.vert -@@ -7,7 +7,8 @@ layout(location = 0) out vec2 sampleCoord; - layout(location = 1) out vec2 shiftedSampleCoord; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -@@ -22,6 +23,6 @@ void main() - { - sampleCoord = tCoord * ubuf.textureScale; - shiftedSampleCoord = (tCoord - ubuf.shift) * ubuf.textureScale; -- vec3 dprSnapPos = floor(vCoord.xyz * ubuf.dpr + 0.5) / ubuf.dpr; -- gl_Position = ubuf.matrix * vec4(dprSnapPos, vCoord.w); -+ vec4 xformed = ubuf.modelViewMatrix * vCoord; -+ gl_Position = ubuf.projectionMatrix * vec4(floor(xformed.xyz * ubuf.dpr + 0.5) / ubuf.dpr, xformed.w); - } -diff --git a/src/quick/scenegraph/shaders_ng/styledtext_a.frag b/src/quick/scenegraph/shaders_ng/styledtext_a.frag -index b673137895..62e162c851 100644 ---- a/src/quick/scenegraph/shaders_ng/styledtext_a.frag -+++ b/src/quick/scenegraph/shaders_ng/styledtext_a.frag -@@ -8,7 +8,8 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -diff --git a/src/quick/scenegraph/shaders_ng/textmask.frag b/src/quick/scenegraph/shaders_ng/textmask.frag -index 518d5c965f..ed8da4cd30 100644 ---- a/src/quick/scenegraph/shaders_ng/textmask.frag -+++ b/src/quick/scenegraph/shaders_ng/textmask.frag -@@ -6,7 +6,8 @@ layout(location = 0) out vec4 fragColor; - layout(binding = 1) uniform sampler2D _qt_texture; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -diff --git a/src/quick/scenegraph/shaders_ng/textmask.vert b/src/quick/scenegraph/shaders_ng/textmask.vert -index 9d80d5dadb..e0b3c01bce 100644 ---- a/src/quick/scenegraph/shaders_ng/textmask.vert -+++ b/src/quick/scenegraph/shaders_ng/textmask.vert -@@ -6,7 +6,8 @@ layout(location = 1) in vec2 tCoord; - layout(location = 0) out vec2 sampleCoord; - - layout(std140, binding = 0) uniform buf { -- mat4 matrix; -+ mat4 modelViewMatrix; -+ mat4 projectionMatrix; - vec4 color; - vec2 textureScale; - float dpr; -@@ -17,6 +18,6 @@ out gl_PerVertex { vec4 gl_Position; }; - void main() - { - sampleCoord = tCoord * ubuf.textureScale; -- vec3 dprSnapPos = floor(vCoord.xyz * ubuf.dpr + 0.5) / ubuf.dpr; -- gl_Position = ubuf.matrix * vec4(dprSnapPos, vCoord.w); -+ vec4 xformed = ubuf.modelViewMatrix * vCoord; -+ gl_Position = ubuf.projectionMatrix * vec4(floor(xformed.xyz * ubuf.dpr + 0.5) / ubuf.dpr, xformed.w); - } -diff --git a/tests/manual/scenegraph_lancelot/data/text/text_nativerendering_subpixelpositions.qml b/tests/manual/scenegraph_lancelot/data/text/text_nativerendering_subpixelpositions.qml -new file mode 100644 -index 0000000000..c60fc4d8b0 ---- /dev/null -+++ b/tests/manual/scenegraph_lancelot/data/text/text_nativerendering_subpixelpositions.qml -@@ -0,0 +1,91 @@ -+import QtQuick 2.0 -+ -+//vary font style, native rendering at non-integer offsets -+ -+Item { -+ id: topLevel -+ width: 320 -+ height: 580 -+ -+ Repeater { -+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken] -+ Text { -+ y: 20 * index -+ clip: true -+ renderType: Text.NativeRendering -+ width: parent.width -+ wrapMode: Text.Wrap -+ font.pointSize: 10 -+ style: modelData -+ styleColor: "green" -+ text: "The quick fox jumps in style " + modelData -+ } -+ } -+ -+ Repeater { -+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken] -+ Text { -+ y: 100.5 + 20 * index -+ clip: true -+ renderType: Text.NativeRendering -+ width: parent.width -+ wrapMode: Text.Wrap -+ font.pointSize: 10 -+ style: modelData -+ styleColor: "green" -+ text: "The quick fox jumps in style " + modelData -+ } -+ } -+ -+ Repeater { -+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken] -+ Text { -+ y: 200.5 + 20 * index -+ x: 0.5 -+ clip: true -+ renderType: Text.NativeRendering -+ width: parent.width -+ wrapMode: Text.Wrap -+ font.pointSize: 10 -+ style: modelData -+ styleColor: "green" -+ text: "The quick fox jumps in style " + modelData -+ } -+ } -+ -+ Repeater { -+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken] -+ Text { -+ y: 300.5 + 20 * index -+ x: 0.5 -+ clip: true -+ renderType: Text.NativeRendering -+ width: parent.width -+ wrapMode: Text.Wrap -+ font.pointSize: 10 -+ style: modelData -+ styleColor: "green" -+ text: "The quick fox jumps in style " + modelData -+ } -+ } -+ -+ Repeater { -+ model: [Text.Normal, Text.Outline, Text.Raised, Text.Sunken] -+ Rectangle { -+ y: 400.5 + 20 * index -+ x: 0.5 -+ width: topLevel.width -+ height: topLevel.height -+ clip: true -+ Text { -+ renderType: Text.NativeRendering -+ width: parent.width -+ wrapMode: Text.Wrap -+ font.pointSize: 10 -+ style: modelData -+ styleColor: "green" -+ text: "The quick fox jumps in style " + modelData -+ } -+ } -+ } -+} --- -2.31.1 - diff --git a/0036-Do-not-revert-properties-of-deleted-objects.patch b/0036-Do-not-revert-properties-of-deleted-objects.patch deleted file mode 100644 index 0934732..0000000 --- a/0036-Do-not-revert-properties-of-deleted-objects.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 55324650f9e759a43dce927f823c9858574106c3 Mon Sep 17 00:00:00 2001 -From: Alexey Edelev -Date: Tue, 12 Jan 2021 16:37:09 +0100 -Subject: [PATCH 36/36] Do not revert properties of deleted objects - -If state contains revert action of properties of deleted objects, -we should avoid adding them to apply list - -Fixes: QTBUG-85106 -Pick-to: 5.15 -Change-Id: Iff57eb9958a054476096f6d951ab7390277a2b39 -Reviewed-by: Ulf Hermann -(cherry picked from commit 96763dbb105fde20431a264789ac27abfdab841c) ---- - src/quick/util/qquickstate.cpp | 5 ++ - .../data/revertNullObjectBinding.qml | 48 +++++++++++++ - .../quick/qquickstates/tst_qquickstates.cpp | 68 +++++++++++++++++++ - 3 files changed, 121 insertions(+) - create mode 100644 tests/auto/quick/qquickstates/data/revertNullObjectBinding.qml - -diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp -index 71ab1f4d62..6a72754bde 100644 ---- a/src/quick/util/qquickstate.cpp -+++ b/src/quick/util/qquickstate.cpp -@@ -635,6 +635,11 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert) - } - } - if (!found) { -+ // If revert list contains bindings assigned to deleted objects, we need to -+ // prevent reverting properties of those objects. -+ if (d->revertList.at(ii).binding() && !d->revertList.at(ii).property().object()) { -+ continue; -+ } - QVariant cur = d->revertList.at(ii).property().read(); - QQmlPropertyPrivate::removeBinding(d->revertList.at(ii).property()); - -diff --git a/tests/auto/quick/qquickstates/data/revertNullObjectBinding.qml b/tests/auto/quick/qquickstates/data/revertNullObjectBinding.qml -new file mode 100644 -index 0000000000..dee82f52ed ---- /dev/null -+++ b/tests/auto/quick/qquickstates/data/revertNullObjectBinding.qml -@@ -0,0 +1,48 @@ -+import QtQuick 2.12 -+import Qt.test 1.0 -+ -+Item { -+ id: root -+ readonly property int someProp: 1234 -+ -+ property bool state1Active: false -+ property bool state2Active: false -+ StateGroup { -+ states: [ -+ State { -+ id: state1 -+ name: "state1" -+ when: state1Active -+ changes: [ -+ PropertyChanges { -+ objectName: "propertyChanges1" -+ target: ContainingObj.obj -+ prop: root.someProp -+ } -+ ] -+ } -+ ]} -+ StateGroup { -+ states: [ -+ State { -+ id: state2 -+ name: "state2" -+ when: state2Active -+ changes: [ -+ PropertyChanges { -+ objectName: "propertyChanges2" -+ target: ContainingObj.obj -+ prop: 11111 -+ } -+ ] -+ } -+ ] -+ } -+ -+ Component.onCompleted: { -+ state1Active = true; -+ state2Active = true; -+ -+ ContainingObj.reset() -+ } -+} -diff --git a/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/tests/auto/quick/qquickstates/tst_qquickstates.cpp -index d5fea3cb28..849522454f 100644 ---- a/tests/auto/quick/qquickstates/tst_qquickstates.cpp -+++ b/tests/auto/quick/qquickstates/tst_qquickstates.cpp -@@ -79,6 +79,55 @@ private: - QML_DECLARE_TYPE(MyRect) - QML_DECLARE_TYPEINFO(MyRect, QML_HAS_ATTACHED_PROPERTIES) - -+class RemovableObj : public QObject -+{ -+ Q_OBJECT -+ Q_PROPERTY(int prop READ prop WRITE setProp NOTIFY propChanged) -+ -+public: -+ RemovableObj(QObject *parent) : QObject(parent), m_prop(4321) { } -+ int prop() const { return m_prop; } -+ -+public slots: -+ void setProp(int prop) -+ { -+ if (m_prop == prop) -+ return; -+ -+ m_prop = prop; -+ emit propChanged(m_prop); -+ } -+ -+signals: -+ void propChanged(int prop); -+ -+private: -+ int m_prop; -+}; -+ -+class ContainingObj : public QObject -+{ -+ Q_OBJECT -+ Q_PROPERTY(RemovableObj *obj READ obj NOTIFY objChanged) -+ RemovableObj *m_obj; -+ -+public: -+ ContainingObj() : m_obj(new RemovableObj(this)) { } -+ RemovableObj *obj() const { return m_obj; } -+ -+ Q_INVOKABLE void reset() -+ { -+ if (m_obj) { -+ m_obj->deleteLater(); -+ } -+ -+ m_obj = new RemovableObj(this); -+ emit objChanged(); -+ } -+signals: -+ void objChanged(); -+}; -+ - class tst_qquickstates : public QQmlDataTest - { - Q_OBJECT -@@ -140,12 +189,20 @@ private slots: - void duplicateStateName(); - void trivialWhen(); - void parentChangeCorrectReversal(); -+ void revertNullObjectBinding(); - }; - - void tst_qquickstates::initTestCase() - { - QQmlDataTest::initTestCase(); - qmlRegisterType("Qt.test", 1, 0, "MyRectangle"); -+ qmlRegisterSingletonType( -+ "Qt.test", 1, 0, "ContainingObj", [](QQmlEngine *engine, QJSEngine *) { -+ static ContainingObj instance; -+ engine->setObjectOwnership(&instance, QQmlEngine::CppOwnership); -+ return &instance; -+ }); -+ qmlRegisterUncreatableType("Qt.test", 1, 0, "RemovableObj", "Uncreatable"); - } - - QByteArray tst_qquickstates::fullDataPath(const QString &path) const -@@ -1692,6 +1749,17 @@ void tst_qquickstates::parentChangeCorrectReversal() - QCOMPARE(oldX, stayingRectX.read().toDouble()); - } - -+void tst_qquickstates::revertNullObjectBinding() -+{ -+ QQmlEngine engine; -+ -+ QQmlComponent c(&engine, testFileUrl("revertNullObjectBinding.qml")); -+ QScopedPointer root { c.create() }; -+ QVERIFY(root); -+ QTest::qWait(10); -+ QQmlProperty state2Active(root.get(), "state2Active"); -+ state2Active.write(false); -+} - - QTEST_MAIN(tst_qquickstates) - --- -2.31.1 - diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 7a60c9a..b16ba55 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -1,55 +1,40 @@ %define majver %(echo %version | cut -d. -f1-2) Name: qt5-qtdeclarative -Version: 5.15.2 -Release: 3mamba +Version: 5.15.7 +Release: 1mamba Summary: Qt5 declarative components Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://www.qt.io/ -Source: https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtdeclarative-everywhere-src-%{version}.tar.xz -# Patches from https://invent.kde.org/qt/qt/qtdeclarative branch kde/5.15 (git format-patch v5.15.2) -# Patches 0001 to 0004 are already included in 5.15.2 tarball -Patch0: 0005-QQuickView-docs-show-correct-usage-of-setInitialProp.patch -Patch1: 0006-QQuickWindow-Check-if-QQuickItem-was-not-deleted.patch -Patch2: 0007-Avoid-GHS-linker-to-optimize-away-QML-type-registrat.patch -Patch3: 0008-QML-Text-doesn-t-reset-lineCount-when-text-is-empty.patch -Patch4: 0009-Doc-mention-that-INCLUDEPATH-must-be-set-in-some-cas.patch -Patch5: 0010-qmlfunctions.qdoc-Add-clarification-to-QML_FOREIGN.patch -Patch6: 0011-Fix-QML-property-cache-leaks-of-delegate-items.patch -Patch7: 0012-QQuickTextInput-Store-mask-data-in-std-unique_ptr.patch -Patch8: 0013-Fix-crash-when-calling-hasOwnProperty-on-proxy-objec.patch -Patch9: 0014-Accessibility-event-is-sent-on-item-s-geometry-chang.patch -Patch10: 0015-qmltypes.prf-Take-abi-into-account-for-_metatypes.js.patch -Patch11: 0016-qv4qmlcontext-Fix-bounded-signal-expressions-when-de.patch -Patch12: 0017-Use-load-qt_tool-for-qmltime.patch -Patch13: 0018-qqmlistmodel-Fix-crash-when-modelCache-is-null.patch -Patch14: 0019-Show-a-tableview-even-if-the-syncView-has-an-empty-m.patch -Patch15: 0020-DesignerSupport-Don-t-skip-already-inspected-objects.patch -Patch16: 0021-QML-Fix-proxy-iteration.patch -Patch17: 0022-Fix-IC-properties-in-same-file.patch -Patch18: 0023-JIT-When-making-memory-writable-include-the-exceptio.patch -Patch19: 0024-doc-explain-QQItem-event-delivery-handlers-setAccept.patch -Patch20: 0025-Give-a-warning-when-StyledText-encounters-a-non-supp.patch -Patch21: 0026-Add-missing-limits-include-to-fix-build-with-GCC-11.patch -Patch22: 0027-Document-that-StyledText-also-supports-nbsp-and-quot.patch -Patch23: 0028-Support-apos-in-styled-text.patch -Patch24: 0029-Remove-unused-QPointer-QQuickPointerMask.patch -Patch25: 0030-Include-limits-in-Yarr.h-to-fix-build-with-GCC-11.patch -Patch26: 0031-QQuickLoader-Do-not-incubate-if-the-source-arrives-a.patch -Patch27: 0032-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch -Patch28: 0033-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch -Patch29: 0034-Fix-distorted-text-with-subpixel-matrix-translation.patch -Patch30: 0035-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch -Patch31: 0036-Do-not-revert-properties-of-deleted-objects.patch +Source: https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtdeclarative-everywhere-opensource-src-%{version}.tar.xz +## upstream patches +## repo: https://invent.kde.org/qt/qt/qtdeclarative +## branch: kde/5.15 +## git format-patch v5.15.7-lts-lgpl +Patch01: 0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch +Patch02: 0002-Support-apos-in-styled-text.patch +Patch03: 0003-Remove-unused-QPointer-QQuickPointerMask.patch +Patch04: 0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch +Patch05: 0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch +Patch06: 0006-Revert-Fix-for-possible-crash-in-QSGDefaultLayer-gra.patch +Patch07: 0007-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch +Patch08: 0008-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch +Patch09: 0009-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch +Patch10: 0010-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch +Patch11: 0011-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch +Patch12: 0012-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch +Patch13: 0013-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch +Patch14: 0014-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch +Patch15: 0015-Fix-Flickable-wheel-velocity-calculation.patch +Patch16: 0016-Fix-Flickable-with-QTBUG-56075-patch-applied.patch +Patch17: 0017-Reset-currentChanges-if-currentChanges-is-active-whe.patch +Patch18: 0018-Revert-Fix-ListView.isCurrentItem-when-used-with-Del.patch License: GPL ## AUTOBUILDREQ-BEGIN -#ld-linux.so.3(GLIBC_2.4): .so link not found -#ld-linux.so.3: .so link not found BuildRequires: glibc-devel -BuildRequires: libatomic-devel BuildRequires: libgcc BuildRequires: libglvnd-devel BuildRequires: libstdc++6-devel @@ -86,7 +71,8 @@ This package contains libraries and header files for developing applications tha %prep %setup -q -n qtdeclarative-everywhere-src-%{version} -%patch0 -p1 +#-D -T +#:<< _EOF %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -105,21 +91,9 @@ This package contains libraries and header files for developing applications tha %patch16 -p1 %patch17 -p1 %patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 %build +#:<< _EOF %_qt5_qmake %make @@ -208,36 +182,25 @@ This package contains libraries and header files for developing applications tha %dir %{_includedir}/qt5/QtQuickWidgets %{_includedir}/qt5/QtQuickWidgets/* %{_libdir}/libQt5PacketProtocol.a -%{_libdir}/libQt5PacketProtocol.la %{_libdir}/libQt5PacketProtocol.prl -%{_libdir}/libQt5Qml.la %{_libdir}/libQt5Qml.prl %{_libdir}/libQt5Qml.so %{_libdir}/libQt5QmlDebug.a -%{_libdir}/libQt5QmlDebug.la %{_libdir}/libQt5QmlDebug.prl %{_libdir}/libQt5QmlDevTools.a -%{_libdir}/libQt5QmlDevTools.la %{_libdir}/libQt5QmlDevTools.prl -%{_libdir}/libQt5QmlModels.la %{_libdir}/libQt5QmlModels.prl %{_libdir}/libQt5QmlModels.so -%{_libdir}/libQt5QmlWorkerScript.la %{_libdir}/libQt5QmlWorkerScript.prl %{_libdir}/libQt5QmlWorkerScript.so -%{_libdir}/libQt5Quick.la %{_libdir}/libQt5Quick.prl %{_libdir}/libQt5Quick.so -%{_libdir}/libQt5QuickParticles.la %{_libdir}/libQt5QuickParticles.prl %{_libdir}/libQt5QuickParticles.so -%{_libdir}/libQt5QuickShapes.la %{_libdir}/libQt5QuickShapes.prl %{_libdir}/libQt5QuickShapes.so -%{_libdir}/libQt5QuickTest.la %{_libdir}/libQt5QuickTest.prl %{_libdir}/libQt5QuickTest.so -%{_libdir}/libQt5QuickWidgets.la %{_libdir}/libQt5QuickWidgets.prl %{_libdir}/libQt5QuickWidgets.so %{_libdir}/qt5/mkspecs/features/qmlcache.prf @@ -280,6 +243,9 @@ This package contains libraries and header files for developing applications tha %{_libdir}/pkgconfig/Qt5QuickWidgets.pc %changelog +* Mon Nov 07 2022 Silvan Calarco 5.15.7-1mamba +- update to 5.15.7 + * Sat Nov 13 2021 Silvan Calarco 5.15.2-3mamba - require qt5-qtquickcontrols and qt5-qtgraphicaleffects