diff --git a/.gitignore b/.gitignore index f4a80ab..1a8e302 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /qtdeclarative-everywhere-opensource-src-5.15.7.tar.xz /qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz /qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz +/qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz diff --git a/0001-Remove-unused-QPointer-QQuickPointerMask.patch b/0001-Remove-unused-QPointer-QQuickPointerMask.patch index 301b448..c3b8815 100644 --- a/0001-Remove-unused-QPointer-QQuickPointerMask.patch +++ b/0001-Remove-unused-QPointer-QQuickPointerMask.patch @@ -1,7 +1,7 @@ -From adc1d82fbac1f85791977ff42299e1f84f0f8db4 Mon Sep 17 00:00:00 2001 +From 7a8bd4c2b3213919343359d5933914ffe1d535e0 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 17 Jun 2021 16:32:28 +0200 -Subject: [PATCH 01/19] Remove unused QPointer +Subject: [PATCH 01/26] Remove unused QPointer Change-Id: I009fa6bbd8599dc3bb2e810176fe20e70ed50851 Reviewed-by: Shawn Rutledge @@ -31,5 +31,5 @@ index fba383e268..0d63618622 100644 QPointF targetStartPos; QPointF lastPos; -- -2.40.0 +2.40.1 diff --git a/0002-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch b/0002-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch index 8ab7e15..e199846 100644 --- a/0002-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch +++ b/0002-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch @@ -1,7 +1,7 @@ -From 3784ed7ea1ffe1f4be126b3425841aba44b369d8 Mon Sep 17 00:00:00 2001 +From 28c1d895c5220d7f5c49d18ae839feaac0f6e69f Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 23 Sep 2021 03:43:04 +0200 -Subject: [PATCH 02/19] QQmlDelegateModel: Refresh the view when a column is +Subject: [PATCH 02/26] 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 @@ -22,7 +22,7 @@ Signed-off-by: Aleix Pol create mode 100644 tests/auto/qml/qqmldelegatemodel/data/redrawUponColumnChange.qml diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp -index 523c0df779..bc6b2447af 100644 +index 4fcff70de6..4157899aa6 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -389,6 +389,12 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel() @@ -174,5 +174,5 @@ index 35f1e2c94d..1722447830 100644 #include "tst_qqmldelegatemodel.moc" -- -2.40.0 +2.40.1 diff --git a/0003-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch b/0003-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch index 95e767d..5a90797 100644 --- a/0003-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch +++ b/0003-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch @@ -1,7 +1,7 @@ -From 18b10527cc14a42a19b5d088845bfd2e96326bbb Mon Sep 17 00:00:00 2001 +From ac46066b113c8c8b93277f717dd2f90207ed0e85 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 03/19] Fix TapHandler so that it actually registers a tap +Subject: [PATCH 03/26] Fix TapHandler so that it actually registers a tap This bug caused all quick examples that used the shared\LauncherList.qml to be broken. @@ -25,7 +25,7 @@ Reviewed-by: Shawn Rutledge 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 +index 7103206470..02141b9a9e 100644 --- a/src/quick/handlers/qquickhandlerpoint.cpp +++ b/src/quick/handlers/qquickhandlerpoint.cpp @@ -82,7 +82,7 @@ void QQuickHandlerPoint::localize(QQuickItem *item) @@ -47,7 +47,7 @@ index 72efdfd0f4..6aef3545dd 100644 // 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 +index d785d8c0ca..a508de455d 100644 --- a/src/quick/handlers/qquicksinglepointhandler.cpp +++ b/src/quick/handlers/qquicksinglepointhandler.cpp @@ -75,7 +75,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) @@ -69,5 +69,5 @@ index b51f53b74f..89081b4e84 100644 void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event) -- -2.40.0 +2.40.1 diff --git a/0004-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch b/0004-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch index 376c97b..503825c 100644 --- a/0004-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch +++ b/0004-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch @@ -1,7 +1,7 @@ -From 2842ffc4e6bc4f6a7578866fbbe58c8ceb1efb16 Mon Sep 17 00:00:00 2001 +From d6514d71fe897493e76bd5e38bccf9b9159c4880 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 16 Nov 2021 22:43:37 +0100 -Subject: [PATCH 04/19] Revert "Fix TapHandler so that it actually registers a +Subject: [PATCH 04/26] Revert "Fix TapHandler so that it actually registers a tap" This reverts commit 36e8ccd434f948e4f11a8f9d59139ec072e41ff5. @@ -13,7 +13,7 @@ It's causing regresions 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 +index 02141b9a9e..7103206470 100644 --- a/src/quick/handlers/qquickhandlerpoint.cpp +++ b/src/quick/handlers/qquickhandlerpoint.cpp @@ -82,7 +82,7 @@ void QQuickHandlerPoint::localize(QQuickItem *item) @@ -35,7 +35,7 @@ index 6aef3545dd..72efdfd0f4 100644 // 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 +index a508de455d..d785d8c0ca 100644 --- a/src/quick/handlers/qquicksinglepointhandler.cpp +++ b/src/quick/handlers/qquicksinglepointhandler.cpp @@ -75,7 +75,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) @@ -57,5 +57,5 @@ index 89081b4e84..b51f53b74f 100644 void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event) -- -2.40.0 +2.40.1 diff --git a/0005-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch b/0005-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch index e2f6dee..2d6de0b 100644 --- a/0005-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch +++ b/0005-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch @@ -1,7 +1,7 @@ -From 2d50aedb262fd387775575f684eb9e2485d84134 Mon Sep 17 00:00:00 2001 +From b02c8610176e1d1ceb65ac5d832d3a21c5a79d47 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sat, 29 Jan 2022 21:59:33 +0200 -Subject: [PATCH 05/19] Make sure QQuickWidget and its offscreen window's +Subject: [PATCH 05/26] Make sure QQuickWidget and its offscreen window's screens are always in sync By default, the offscreen window is placed on the primary screen. @@ -80,5 +80,5 @@ index 39780f8de3..223d91f579 100644 case QEvent::Move: d->updatePosition(); -- -2.40.0 +2.40.1 diff --git a/0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch b/0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch index 49e4432..9e5b865 100644 --- a/0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch +++ b/0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch @@ -1,7 +1,7 @@ -From 9a3d7bc6cf8eea575e597ff1af03d87f7fbdc9aa Mon Sep 17 00:00:00 2001 +From d1d910545103549912d1b51383a5ace872dfb1f8 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 4 May 2022 09:10:54 +0200 -Subject: [PATCH 06/19] QQuickItem: Guard against cycles in +Subject: [PATCH 06/26] QQuickItem: Guard against cycles in nextPrevItemInTabFocusChain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -118,5 +118,5 @@ index c8f251dbe1..c8ef36ee68 100644 { if (!qt_tab_all_widgets()) -- -2.40.0 +2.40.1 diff --git a/0007-Don-t-convert-QByteArray-in-startDrag.patch b/0007-Don-t-convert-QByteArray-in-startDrag.patch index 007bd7a..9071a18 100644 --- a/0007-Don-t-convert-QByteArray-in-startDrag.patch +++ b/0007-Don-t-convert-QByteArray-in-startDrag.patch @@ -1,7 +1,7 @@ -From c257eb6a0eeb159c670c9cf6b37d3009ec8879e5 Mon Sep 17 00:00:00 2001 +From 70a38e3c897e3ba72b50413d0f994c9f5ebaffd8 Mon Sep 17 00:00:00 2001 From: Fushan Wen Date: Tue, 1 Nov 2022 22:35:24 +0800 -Subject: [PATCH 07/19] Don't convert QByteArray in `startDrag` +Subject: [PATCH 07/26] Don't convert QByteArray in `startDrag` QMimeData::setData expects the provided data to contain the correctly encoded QByteArray, so if the variant contains a QByteArray, then take @@ -56,5 +56,5 @@ index 8321fcfeed..3b50370355 100644 drag->setMimeData(mimeData); if (pixmapLoader.isReady()) { -- -2.40.0 +2.40.1 diff --git a/0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch b/0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch index 947b3c4..f770d7d 100644 --- a/0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch +++ b/0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch @@ -1,7 +1,7 @@ -From cbb5f2d37a07b75f9d340fd1e1f34a6d1e078eba Mon Sep 17 00:00:00 2001 +From 63d011a519c1fee2a0f5dbcc204def9e950a168b Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Sat, 5 Nov 2022 18:48:41 +0100 -Subject: [PATCH 08/19] Fix build after +Subject: [PATCH 08/26] Fix build after 95290f66b806a307b8da1f72f8fc2c69801933d0 --- @@ -22,5 +22,5 @@ index 3b50370355..383078b3b9 100644 else mimeData->setData(it.key(), it.value().toString().toUtf8()); -- -2.40.0 +2.40.1 diff --git a/0009-Implement-accessibility-for-QQuickWidget.patch b/0009-Implement-accessibility-for-QQuickWidget.patch index fc52c8d..79a625c 100644 --- a/0009-Implement-accessibility-for-QQuickWidget.patch +++ b/0009-Implement-accessibility-for-QQuickWidget.patch @@ -1,7 +1,7 @@ -From 3f7ac5540c8796ec2bb2b595ca6648035a0f8b18 Mon Sep 17 00:00:00 2001 +From 95f4632430db5668fa022983c76e4f6bde74c33d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 7 May 2021 10:07:50 +0200 -Subject: [PATCH 09/19] Implement accessibility for QQuickWidget +Subject: [PATCH 09/26] Implement accessibility for QQuickWidget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -561,5 +561,5 @@ index 2438e577ae..f46deb54ac 100644 load(qt_module) -- -2.40.0 +2.40.1 diff --git a/0010-Send-ObjectShow-event-for-visible-components-after-i.patch b/0010-Send-ObjectShow-event-for-visible-components-after-i.patch index 1537cb3..e6df5cd 100644 --- a/0010-Send-ObjectShow-event-for-visible-components-after-i.patch +++ b/0010-Send-ObjectShow-event-for-visible-components-after-i.patch @@ -1,7 +1,7 @@ -From bdb3af04019b9134d6e815f4fe54317db63d0152 Mon Sep 17 00:00:00 2001 +From ffa3c975270c5026be40912451a289492956f01c Mon Sep 17 00:00:00 2001 From: Fushan Wen Date: Sat, 5 Nov 2022 01:44:30 +0800 -Subject: [PATCH 10/19] Send ObjectShow event for visible components after +Subject: [PATCH 10/26] Send ObjectShow event for visible components after initialized MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -42,5 +42,5 @@ index ec55fb2998..499fb61d1b 100644 QQuickStateGroup *QQuickItemPrivate::_states() -- -2.40.0 +2.40.1 diff --git a/0011-QQuickItem-avoid-emitting-signals-during-destruction.patch b/0011-QQuickItem-avoid-emitting-signals-during-destruction.patch index 059c4bb..d035109 100644 --- a/0011-QQuickItem-avoid-emitting-signals-during-destruction.patch +++ b/0011-QQuickItem-avoid-emitting-signals-during-destruction.patch @@ -1,7 +1,7 @@ -From 19afcf36b92dc36e83b613e4b9ee383f6beb02dc Mon Sep 17 00:00:00 2001 +From 2384b04415045b2203894b24a3743b03eeadbc88 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 9 Nov 2022 15:34:11 +0100 -Subject: [PATCH 11/19] QQuickItem: avoid emitting signals during destruction +Subject: [PATCH 11/26] QQuickItem: avoid emitting signals during destruction If a QQuickItem is in the QQuickItem destructor, then it is both unsafe and unnecessary to emit property change notifications. Connected code @@ -109,5 +109,5 @@ index 841d91bb40..ade8fb61f2 100644 enum DirtyType { TransformOrigin = 0x00000001, -- -2.40.0 +2.40.1 diff --git a/0012-a11y-track-item-enabled-state.patch b/0012-a11y-track-item-enabled-state.patch index 3778eee..74392fd 100644 --- a/0012-a11y-track-item-enabled-state.patch +++ b/0012-a11y-track-item-enabled-state.patch @@ -1,7 +1,7 @@ -From 5ed173f4ba070bca6c9ec3335b84cc322885b01d Mon Sep 17 00:00:00 2001 +From 5b6faa5cc115d5be8b2300e059592f8dd1a84ac8 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Mon, 28 Nov 2022 14:59:33 +0100 -Subject: [PATCH 12/19] a11y: track item enabled state +Subject: [PATCH 12/26] a11y: track item enabled state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -53,5 +53,5 @@ index 5ee2a440a3..c370d6e5c3 100644 } -- -2.40.0 +2.40.1 diff --git a/0013-Make-QaccessibleQuickWidget-private-API.patch b/0013-Make-QaccessibleQuickWidget-private-API.patch index 1b9fa28..8e3d079 100644 --- a/0013-Make-QaccessibleQuickWidget-private-API.patch +++ b/0013-Make-QaccessibleQuickWidget-private-API.patch @@ -1,7 +1,7 @@ -From a8fa6c930597b633367777044f4c0328012f6bd5 Mon Sep 17 00:00:00 2001 +From 3d4ff545a998066f563d03bd0e0da6aee81e811d Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Tue, 1 Jun 2021 16:40:44 +0200 -Subject: [PATCH 13/19] Make QaccessibleQuickWidget private API +Subject: [PATCH 13/26] Make QaccessibleQuickWidget private API Its base class is private API, so it should be private API, too. @@ -83,5 +83,5 @@ index f46deb54ac..85d156b8a3 100644 SOURCES += \ -- -2.40.0 +2.40.1 diff --git a/0014-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch b/0014-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch index 58d751c..91a02b0 100644 --- a/0014-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch +++ b/0014-Qml-Don-t-crash-when-as-casting-to-type-with-errors.patch @@ -1,7 +1,7 @@ -From 7be5422134167fe6d9fd44ef683f407bbda1bce7 Mon Sep 17 00:00:00 2001 +From 0d21fc0cb74c01368107bf2779c34e5734b5e5ae Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 30 Nov 2021 14:39:48 +0100 -Subject: [PATCH 14/19] Qml: Don't crash when as-casting to type with errors +Subject: [PATCH 14/26] Qml: Don't crash when as-casting to type with errors Such types don't have a compilation unit, but we still know their names. @@ -109,5 +109,5 @@ index bffb62c59e..97cc64991f 100644 #include "tst_qqmllanguage.moc" -- -2.40.0 +2.40.1 diff --git a/0015-Fix-missing-glyphs-when-using-NativeRendering.patch b/0015-Fix-missing-glyphs-when-using-NativeRendering.patch index e761faa..c55fdb3 100644 --- a/0015-Fix-missing-glyphs-when-using-NativeRendering.patch +++ b/0015-Fix-missing-glyphs-when-using-NativeRendering.patch @@ -1,7 +1,7 @@ -From d54b978c0cba2bf75e145c9e1b00d2a9ab495d70 Mon Sep 17 00:00:00 2001 +From 4f645419ab8def41d1bdddddc5976b2ff5620bff Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 19 Dec 2022 10:05:33 +0100 -Subject: [PATCH 15/19] Fix missing glyphs when using NativeRendering +Subject: [PATCH 15/26] Fix missing glyphs when using NativeRendering When we look up glyphs with subpixel positions in the glyph cache, we use the calculated subpixel position (from a set of predefined @@ -50,5 +50,5 @@ index f912da5799..fd128aa06e 100644 QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition); const QTextureGlyphCache::Coord &c = cache->coords.value(glyph); -- -2.40.0 +2.40.1 diff --git a/0016-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch b/0016-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch index 4cf5df5..405403f 100644 --- a/0016-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch +++ b/0016-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch @@ -1,7 +1,7 @@ -From 70b44dd18b9727e9aae857297265a751700a297e Mon Sep 17 00:00:00 2001 +From 187bb66368921ce4a6522aca78531714485c377c Mon Sep 17 00:00:00 2001 From: Fushan Wen Date: Tue, 10 Jan 2023 20:42:04 +0800 -Subject: [PATCH 16/19] Revert "Fix missing glyphs when using NativeRendering" +Subject: [PATCH 16/26] Revert "Fix missing glyphs when using NativeRendering" This reverts commit da5e53b649f50cd9cdd89dadbba16f05e4070be2. @@ -28,5 +28,5 @@ index fd128aa06e..f912da5799 100644 QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition); const QTextureGlyphCache::Coord &c = cache->coords.value(glyph); -- -2.40.0 +2.40.1 diff --git a/0017-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch b/0017-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch index 9fa8e0d..d141355 100644 --- a/0017-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch +++ b/0017-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch @@ -1,7 +1,7 @@ -From c1e41d061329cc886a56477c8c2fd0e81add7780 Mon Sep 17 00:00:00 2001 +From 0d217b88c6bf5673464e350e3a62773e69555f98 Mon Sep 17 00:00:00 2001 From: Jaeyoon Jung Date: Fri, 19 Feb 2021 08:11:57 +0900 -Subject: [PATCH 17/19] QQmlImportDatabase: Make sure the newly added import +Subject: [PATCH 17/26] QQmlImportDatabase: Make sure the newly added import path be first If it already exists in the import list, move it to the first place. @@ -53,5 +53,5 @@ index 9c865b3f73..1f788f7a7f 100644 Q_DECLARE_METATYPE(QQmlImports::ImportVersion) -- -2.40.0 +2.40.1 diff --git a/0018-QQuickState-when-handle-QJSValue-properties-correctl.patch b/0018-QQuickState-when-handle-QJSValue-properties-correctl.patch index 8c35853..55e33a9 100644 --- a/0018-QQuickState-when-handle-QJSValue-properties-correctl.patch +++ b/0018-QQuickState-when-handle-QJSValue-properties-correctl.patch @@ -1,7 +1,7 @@ -From 0e1bed3c3e27d44d86d6f68a8b93b96a4821575c Mon Sep 17 00:00:00 2001 +From 35608b36b284000f5871deb6a0d58113110e01e8 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 20 Jul 2022 11:44:43 +0200 -Subject: [PATCH 18/19] QQuickState::when: handle QJSValue properties correctly +Subject: [PATCH 18/26] QQuickState::when: handle QJSValue properties correctly If one assigns a binding whose evaluation results in a QJSValue, care must be take to correctly convert it into a bool. Instead of directly @@ -98,5 +98,5 @@ index aa55b42935..26e86672b0 100644 { QQmlEngine engine; -- -2.40.0 +2.40.1 diff --git a/0019-Models-Avoid-crashes-when-deleting-cache-items.patch b/0019-Models-Avoid-crashes-when-deleting-cache-items.patch index 36c78c4..0206ef7 100644 --- a/0019-Models-Avoid-crashes-when-deleting-cache-items.patch +++ b/0019-Models-Avoid-crashes-when-deleting-cache-items.patch @@ -1,7 +1,7 @@ -From 89bf481b9b14f038c5e16421a7fce6dc6523785f Mon Sep 17 00:00:00 2001 +From 32730dad9adcaab137cf2fe434b03be23bbe9c7d Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 29 Mar 2023 16:36:03 +0200 -Subject: [PATCH 19/19] Models: Avoid crashes when deleting cache items +Subject: [PATCH 19/26] Models: Avoid crashes when deleting cache items Pick-to: 6.5 6.2 5.15 Fixes: QTBUG-91425 @@ -20,7 +20,7 @@ Reviewed-by: Fabian Kosmale create mode 100644 tests/auto/qml/qqmldelegatemodel/data/deleteRace.qml diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp -index bc6b2447af..551e0ede95 100644 +index 4157899aa6..5b7e767ae2 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -1883,10 +1883,15 @@ void QQmlDelegateModelPrivate::emitChanges() @@ -158,5 +158,5 @@ index 1722447830..f473cff75f 100644 #include "tst_qqmldelegatemodel.moc" -- -2.40.0 +2.40.1 diff --git a/0020-qv4function-Fix-crash-due-to-reference-being-invalid.patch b/0020-qv4function-Fix-crash-due-to-reference-being-invalid.patch new file mode 100644 index 0000000..7eb8bb4 --- /dev/null +++ b/0020-qv4function-Fix-crash-due-to-reference-being-invalid.patch @@ -0,0 +1,35 @@ +From adad56c92c633248f0fe467f8e0c32dc461f6716 Mon Sep 17 00:00:00 2001 +From: Maximilian Goldstein +Date: Wed, 9 Jun 2021 15:02:45 +0200 +Subject: [PATCH 20/26] qv4function: Fix crash due to reference being + invalidated + +Function::updateInternalClass creates a reference to a QStringList that is appended to before being used. +This is unsafe and can leads to a segfault if the append() causes a reallocation. + +Fixes: QTBUG-94360 +Pick-to: 5.15 6.1 6.2 +Change-Id: Iac49e8d816cf440ca2b70e133c88314eb8df6b91 +Reviewed-by: Fabian Kosmale +Reviewed-by: Andrei Golubev +(cherry picked from commit 7fa28f98824a94396106eadfc028b329985a0cfc) +--- + src/qml/jsruntime/qv4function.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp +index aeb4835c40..9082628a1a 100644 +--- a/src/qml/jsruntime/qv4function.cpp ++++ b/src/qml/jsruntime/qv4function.cpp +@@ -136,7 +136,7 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QList +Date: Tue, 29 Mar 2022 10:44:04 +0200 +Subject: [PATCH 21/26] Quick Animations: Fix crash + +SwipeDelegate causes the running animation job to be deleted when +calling swipe.close in swipe.completed. Employ the RETURN_IF_DELETED +check in more places to avoid crashes. + +Fixes: QTBUG-100560 +Task-number: QTBUG-103223 +Pick-to: 6.3 6.2 5.15 +Change-Id: I276eeaa9aed1bdb36449b322a24641fa02c4d5e4 +Reviewed-by: Ulf Hermann +(cherry picked from commit 0238af0bd48b831d72126f2228d5913eccf67bae) + +* asturmlechner 2023-04-09: Resolve conflict with dev branch commit + 4938984f9a779192264757a06e6ca555fc8f5e91 +--- + .../qcontinuinganimationgroupjob.cpp | 4 +- + .../animations/qparallelanimationgroupjob.cpp | 4 +- + .../swipedelegate/CloseOnCompletedWorks.qml | 74 +++++++++++++++++++ + 3 files changed, 78 insertions(+), 4 deletions(-) + create mode 100644 tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml + +diff --git a/src/qml/animations/qcontinuinganimationgroupjob.cpp b/src/qml/animations/qcontinuinganimationgroupjob.cpp +index 88c0e9e60e..61a9dc36f8 100644 +--- a/src/qml/animations/qcontinuinganimationgroupjob.cpp ++++ b/src/qml/animations/qcontinuinganimationgroupjob.cpp +@@ -82,9 +82,9 @@ void QContinuingAnimationGroupJob::updateState(QAbstractAnimationJob::State newS + return; + } + for (QAbstractAnimationJob *animation = firstChild(); animation; animation = animation->nextSibling()) { +- resetUncontrolledAnimationFinishTime(animation); ++ RETURN_IF_DELETED(resetUncontrolledAnimationFinishTime(animation)); + animation->setDirection(m_direction); +- animation->start(); ++ RETURN_IF_DELETED(animation->start()); + } + break; + } +diff --git a/src/qml/animations/qparallelanimationgroupjob.cpp b/src/qml/animations/qparallelanimationgroupjob.cpp +index 420a934ba2..a828d0e234 100644 +--- a/src/qml/animations/qparallelanimationgroupjob.cpp ++++ b/src/qml/animations/qparallelanimationgroupjob.cpp +@@ -144,10 +144,10 @@ void QParallelAnimationGroupJob::updateState(QAbstractAnimationJob::State newSta + animation->stop(); + m_previousLoop = m_direction == Forward ? 0 : m_loopCount - 1; + } +- resetUncontrolledAnimationFinishTime(animation); ++ RETURN_IF_DELETED(resetUncontrolledAnimationFinishTime(animation)); + animation->setDirection(m_direction); + if (shouldAnimationStart(animation, oldState == Stopped)) +- animation->start(); ++ RETURN_IF_DELETED(animation->start()); + } + break; + } +diff --git a/tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml b/tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml +new file mode 100644 +index 0000000000..38dfde41c3 +--- /dev/null ++++ b/tests/manual/quickcontrols2/swipedelegate/CloseOnCompletedWorks.qml +@@ -0,0 +1,74 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2022 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:BSD$ ++** 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. ++** ++** BSD License Usage ++** Alternatively, you may use this file under the terms of the BSD license ++** as follows: ++** ++** "Redistribution and use in source and binary forms, with or without ++** modification, are permitted provided that the following conditions are ++** met: ++** * Redistributions of source code must retain the above copyright ++** notice, this list of conditions and the following disclaimer. ++** * Redistributions in binary form must reproduce the above copyright ++** notice, this list of conditions and the following disclaimer in ++** the documentation and/or other materials provided with the ++** distribution. ++** * Neither the name of The Qt Company Ltd nor the names of its ++** contributors may be used to endorse or promote products derived ++** from this software without specific prior written permission. ++** ++** ++** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++import QtQuick 2 ++import QtQuick.Controls 2 ++ApplicationWindow { ++ visible: true ++ width: 640 ++ height: 480 ++ ++ ListView { ++ anchors.fill: parent ++ model: 2 ++ ++ delegate: SwipeDelegate { ++ text: "Swipe me left (should not crash)" ++ ++ swipe.right: Label { ++ text: "Release (should not crash)" ++ } ++ ++ swipe.onCompleted: { ++ swipe.close() ++ } ++ } ++ } ++} +-- +2.40.1 + diff --git a/0022-Prevent-crash-when-destroying-asynchronous-Loader.patch b/0022-Prevent-crash-when-destroying-asynchronous-Loader.patch new file mode 100644 index 0000000..48de03e --- /dev/null +++ b/0022-Prevent-crash-when-destroying-asynchronous-Loader.patch @@ -0,0 +1,129 @@ +From 3366947eb58c0c5ad8a7e714a6b9667e1c3ff7b8 Mon Sep 17 00:00:00 2001 +From: Joni Poikelin +Date: Thu, 3 Sep 2020 14:22:26 +0300 +Subject: [PATCH 22/26] Prevent crash when destroying asynchronous Loader + +Fixes: QTBUG-86255 +Pick-to: 5.15 +Change-Id: I30488b64d910a1409a43e2e98ee7ab084aec33d2 +Reviewed-by: Ulf Hermann +(cherry picked from commit 149c1dd07b54ee0c027d94a49d52160dc4f4e2ac) + +* asturmlechner 2023-01-06: Resolve conflict with dev branch commits + d51c007ecc8aa6256cb95cf3992e5ac34a70fa3f and + b2a4a61e8cb0839ba293783ac03c72f35c7b1307 +--- + src/qml/qml/qqmlvmemetaobject.cpp | 2 +- + .../quick/qquickgridview/data/qtbug86255.qml | 55 +++++++++++++++++++ + .../qquickgridview/tst_qquickgridview.cpp | 13 +++++ + 3 files changed, 69 insertions(+), 1 deletion(-) + create mode 100644 tests/auto/quick/qquickgridview/data/qtbug86255.qml + +diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp +index aa9f4bc1bd..09503a7e99 100644 +--- a/src/qml/qml/qqmlvmemetaobject.cpp ++++ b/src/qml/qml/qqmlvmemetaobject.cpp +@@ -254,7 +254,7 @@ void QQmlVMEMetaObjectEndpoint::tryConnect() + if (!pd) + return; + +- if (pd->notifyIndex() != -1) ++ if (pd->notifyIndex() != -1 && ctxt->engine) + connect(target, pd->notifyIndex(), ctxt->engine); + } + +diff --git a/tests/auto/quick/qquickgridview/data/qtbug86255.qml b/tests/auto/quick/qquickgridview/data/qtbug86255.qml +new file mode 100644 +index 0000000000..20688b1967 +--- /dev/null ++++ b/tests/auto/quick/qquickgridview/data/qtbug86255.qml +@@ -0,0 +1,55 @@ ++import QtQuick 2.15 ++ ++Item { ++ width: 240 ++ height: 320 ++ ++ GridView { ++ id: grid ++ objectName: "view" ++ anchors.fill: parent ++ cellWidth: 64 ++ cellHeight: 64 ++ model: ListModel { ++ id: listModel ++ ++ Component.onCompleted: reload() ++ ++ function reload() { ++ clear(); ++ for (let i = 0; i < 1000; i++) { ++ let magic = Math.random(); ++ append( { magic } ); ++ } ++ } ++ } ++ clip: true ++ delegate: Item { ++ id: d ++ property string val: magic ++ Loader { ++ property alias value: d.val ++ asynchronous: true ++ sourceComponent: cmp ++ } ++ } ++ } ++ ++ Timer { ++ running: true ++ interval: 1000 ++ onTriggered: listModel.reload() ++ } ++ Timer { ++ running: true ++ interval: 500 ++ onTriggered: grid.flick(0, -4000) ++ } ++ ++ Component { ++ id: cmp ++ Text { ++ text: value ++ } ++ } ++} +diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +index 94ec4f44d5..7d0d9fa7a7 100644 +--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp ++++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +@@ -213,6 +213,7 @@ private slots: + void QTBUG_45640(); + void QTBUG_49218(); + void QTBUG_48870_fastModelUpdates(); ++ void QTBUG_86255(); + + void keyNavigationEnabled(); + void resizeDynamicCellWidthRtL(); +@@ -6814,6 +6815,18 @@ void tst_QQuickGridView::resizeDynamicCellWidthRtL() + QTRY_COMPARE(gridview->contentX(), 0.f); + } + ++void tst_QQuickGridView::QTBUG_86255() ++{ ++ QScopedPointer window(createView()); ++ window->setSource(testFileUrl("qtbug86255.qml")); ++ window->show(); ++ QVERIFY(QTest::qWaitForWindowExposed(window.data())); ++ QQuickGridView *view = findItem(window->rootObject(), "view"); ++ QVERIFY(view != nullptr); ++ QTRY_COMPARE(view->isFlicking(), true); ++ QTRY_COMPARE(view->isFlicking(), false); ++} ++ + void tst_QQuickGridView::releaseItems() + { + QScopedPointer view(createView()); +-- +2.40.1 + diff --git a/0023-QQuickItem-Fix-effective-visibility-for-items-withou.patch b/0023-QQuickItem-Fix-effective-visibility-for-items-withou.patch new file mode 100644 index 0000000..02219ea --- /dev/null +++ b/0023-QQuickItem-Fix-effective-visibility-for-items-withou.patch @@ -0,0 +1,81 @@ +From 688795f02ecc163e7cb18dfb6c87273d7e613cbf Mon Sep 17 00:00:00 2001 +From: Volker Hilsheimer +Date: Fri, 18 Nov 2022 14:20:20 +0100 +Subject: [PATCH 23/26] QQuickItem: Fix effective visibility for items without + parent + +Items are visible if they are children of a visible parent, and not +explicitly hidden. The effectiveVisible member stores the state and is +updated when conditions that impact the item visibility changes. + +The old code returned true for items outside a visual hierarchy, which +broke signal emission when items were removed from a parent, e.g. +because the parent got destroyed. With this change, items removed from +a visual hierarchy will emit the visibleChanged signal. + +Note: QQuickItem initializes the effectiveVisible member to true, even +if the item was created without parent item. Visual items are required +to be added to a visual hierarchy via setParentItem. For this reason, +newly created items never emit visibleChanged when they are added to +a parent. + +Adjust the QQuickItem::visible test - it creates an item hierarchy +without window. Such items are never visible, so add a window and +parent the test item hierarchy to the window's content item. + +This fixes the expected failures in the tests. It does introduce an +incompatibility with QGraphicsView and QGraphicsItem, which continue +to return true from QGraphicsItem::isVisible for items that are not +in an item hierarchy. + +[ChangeLog][Qt Quick][QQuickItem] The visible property of Items without +a parent now always returns false, and the visibleChanged signal gets +emitted when the parent item of a visible item becomes null. + +Fixes: QTBUG-108213 +Change-Id: If4b2947cefd1407853f0f29e6c3fdbd49fc9af65 +Reviewed-by: Fabian Kosmale +Reviewed-by: Shawn Rutledge +(cherry picked from commit d1b9a4cacfb966cf0a37983d8f8044f3aedf5de3) + +CCBUG: 467909 +CCBUG: 396359 +--- + src/quick/items/qquickitem.cpp | 6 ++---- + tests/auto/quick/qquickitem/tst_qquickitem.cpp | 2 ++ + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp +index c370d6e5c3..0d421349d7 100644 +--- a/src/quick/items/qquickitem.cpp ++++ b/src/quick/items/qquickitem.cpp +@@ -6081,10 +6081,8 @@ void QQuickItem::setEnabled(bool e) + + bool QQuickItemPrivate::calcEffectiveVisible() const + { +- // XXX todo - Should the effective visible of an element with no parent just be the current +- // effective visible? This would prevent pointless re-processing in the case of an element +- // moving to/from a no-parent situation, but it is different from what graphics view does. +- return explicitVisible && (!parentItem || QQuickItemPrivate::get(parentItem)->effectiveVisible); ++ // An item is visible if it is a child of a visible parent, and not explicitly hidden. ++ return explicitVisible && parentItem && QQuickItemPrivate::get(parentItem)->effectiveVisible; + } + + bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible) +diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp +index 42348d8dd1..34eefd85e6 100644 +--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp ++++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp +@@ -989,7 +989,9 @@ void tst_qquickitem::setParentItem() + + void tst_qquickitem::visible() + { ++ QQuickWindow window; + QQuickItem *root = new QQuickItem; ++ root->setParentItem(window.contentItem()); + + QQuickItem *child1 = new QQuickItem; + child1->setParentItem(root); +-- +2.40.1 + diff --git a/0024-Revert-QQuickItem-Fix-effective-visibility-for-items.patch b/0024-Revert-QQuickItem-Fix-effective-visibility-for-items.patch new file mode 100644 index 0000000..b496c73 --- /dev/null +++ b/0024-Revert-QQuickItem-Fix-effective-visibility-for-items.patch @@ -0,0 +1,51 @@ +From 70bc0c03423fe861bb917c67041f71e08ec10343 Mon Sep 17 00:00:00 2001 +From: Fushan Wen +Date: Fri, 21 Apr 2023 23:38:04 +0800 +Subject: [PATCH 24/26] Revert "QQuickItem: Fix effective visibility for items + without parent" + +This breaks applications that use QQmlPropertyList to store QQuickItem +and don't set a parentItem for them. + +Ref: https://github.com/musescore/MuseScore/issues/17276 + +This reverts commit 45c22a0221937682f4496801a495458a00f76d3a. +--- + src/quick/items/qquickitem.cpp | 6 ++++-- + tests/auto/quick/qquickitem/tst_qquickitem.cpp | 2 -- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp +index 0d421349d7..c370d6e5c3 100644 +--- a/src/quick/items/qquickitem.cpp ++++ b/src/quick/items/qquickitem.cpp +@@ -6081,8 +6081,10 @@ void QQuickItem::setEnabled(bool e) + + bool QQuickItemPrivate::calcEffectiveVisible() const + { +- // An item is visible if it is a child of a visible parent, and not explicitly hidden. +- return explicitVisible && parentItem && QQuickItemPrivate::get(parentItem)->effectiveVisible; ++ // XXX todo - Should the effective visible of an element with no parent just be the current ++ // effective visible? This would prevent pointless re-processing in the case of an element ++ // moving to/from a no-parent situation, but it is different from what graphics view does. ++ return explicitVisible && (!parentItem || QQuickItemPrivate::get(parentItem)->effectiveVisible); + } + + bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible) +diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp +index 34eefd85e6..42348d8dd1 100644 +--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp ++++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp +@@ -989,9 +989,7 @@ void tst_qquickitem::setParentItem() + + void tst_qquickitem::visible() + { +- QQuickWindow window; + QQuickItem *root = new QQuickItem; +- root->setParentItem(window.contentItem()); + + QQuickItem *child1 = new QQuickItem; + child1->setParentItem(root); +-- +2.40.1 + diff --git a/0025-Accessibility-respect-value-in-attached-Accessible-i.patch b/0025-Accessibility-respect-value-in-attached-Accessible-i.patch new file mode 100644 index 0000000..6dc2c08 --- /dev/null +++ b/0025-Accessibility-respect-value-in-attached-Accessible-i.patch @@ -0,0 +1,111 @@ +From a9f99d945e23b915502ddbd56e20a2af9f33296e Mon Sep 17 00:00:00 2001 +From: Volker Hilsheimer +Date: Tue, 18 Apr 2023 22:05:36 +0200 +Subject: [PATCH 25/26] Accessibility: respect value in attached Accessible in + controls +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +QQuickItemPrivate::accessibleRole is virtual and called by the framework +to determine the role of an item. The default implementation checks and +respects a possible Accessible attached object. However, subclasses that +override the virtual don't, so the attached properties are ignored, and +the class-specific implementation wins. This makes it impossible to +change the role of e.g. a checkable button. + +To fix that, move the code respecting the attached object into a non- +virtual function that the framework calls instead, and only call the +virtual member if there is no attached object, or if that object is not +initialized with a role. Replace calls to the virtual from the +framework with calls to the non-virtual wrapper. + +Do this for both QQuickItem and for QQuickPopup, and adjust the logic +in QQuickControl types that create an attached object and initialize +it's role when accessibility becomes active. Use the non-overridable +effective role value for that as well. + +Add a test case, and to avoid any new framework calls to the virtual, +make it private. + +Fixes: QTBUG-110114 +Pick-to: 6.5 6.2 +Change-Id: Ia709cecbd181b6d8ee3297a4af60c1e7db9a2c51 +Reviewed-by: Qt CI Bot +Reviewed-by: Jan Arve Sæther +(cherry picked from commit 3c08d08ae2bbd449cc0579a1b3cb499383c7a60c) +--- + src/quick/accessible/qaccessiblequickitem.cpp | 2 +- + src/quick/items/qquickitem.cpp | 17 ++++++++++++----- + src/quick/items/qquickitem_p.h | 3 +++ + 3 files changed, 16 insertions(+), 6 deletions(-) + +diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp +index a8df58d450..99e6eff7c3 100644 +--- a/src/quick/accessible/qaccessiblequickitem.cpp ++++ b/src/quick/accessible/qaccessiblequickitem.cpp +@@ -230,7 +230,7 @@ QAccessible::Role QAccessibleQuickItem::role() const + + QAccessible::Role role = QAccessible::NoRole; + if (item()) +- role = QQuickItemPrivate::get(item())->accessibleRole(); ++ role = QQuickItemPrivate::get(item())->effectiveAccessibleRole(); + if (role == QAccessible::NoRole) { + if (qobject_cast(const_cast(item()))) + role = QAccessible::StaticText; +diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp +index c370d6e5c3..9e8b289376 100644 +--- a/src/quick/items/qquickitem.cpp ++++ b/src/quick/items/qquickitem.cpp +@@ -2400,7 +2400,7 @@ bool QQuickItemPrivate::canAcceptTabFocus(QQuickItem *item) + return true; + + #if QT_CONFIG(accessibility) +- QAccessible::Role role = QQuickItemPrivate::get(item)->accessibleRole(); ++ QAccessible::Role role = QQuickItemPrivate::get(item)->effectiveAccessibleRole(); + if (role == QAccessible::EditableText || role == QAccessible::Table || role == QAccessible::List) { + return true; + } else if (role == QAccessible::ComboBox || role == QAccessible::SpinBox) { +@@ -9000,13 +9000,20 @@ QQuickItemPrivate::ExtraData::ExtraData() + + + #if QT_CONFIG(accessibility) +-QAccessible::Role QQuickItemPrivate::accessibleRole() const ++QAccessible::Role QQuickItemPrivate::effectiveAccessibleRole() const + { + Q_Q(const QQuickItem); +- QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, false)); +- if (accessibleAttached) +- return accessibleAttached->role(); ++ auto *attached = qmlAttachedPropertiesObject(q, false); ++ auto role = QAccessible::NoRole; ++ if (auto *accessibleAttached = qobject_cast(attached)) ++ role = accessibleAttached->role(); ++ if (role == QAccessible::NoRole) ++ role = accessibleRole(); ++ return role; ++} + ++QAccessible::Role QQuickItemPrivate::accessibleRole() const ++{ + return QAccessible::NoRole; + } + #endif +diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h +index ade8fb61f2..6f329bd119 100644 +--- a/src/quick/items/qquickitem_p.h ++++ b/src/quick/items/qquickitem_p.h +@@ -575,7 +575,10 @@ public: + virtual void implicitHeightChanged(); + + #if QT_CONFIG(accessibility) ++ QAccessible::Role effectiveAccessibleRole() const; ++private: + virtual QAccessible::Role accessibleRole() const; ++public: + #endif + + void setImplicitAntialiasing(bool antialiasing); +-- +2.40.1 + diff --git a/0026-qml-tool-Use-QCommandLineParser-process-rather-than-.patch b/0026-qml-tool-Use-QCommandLineParser-process-rather-than-.patch new file mode 100644 index 0000000..e8dba9e --- /dev/null +++ b/0026-qml-tool-Use-QCommandLineParser-process-rather-than-.patch @@ -0,0 +1,57 @@ +From 5352f113b3c7a5af2ad2741d593c6e6a758eb93e Mon Sep 17 00:00:00 2001 +From: Shawn Rutledge +Date: Tue, 16 May 2023 07:59:46 +0200 +Subject: [PATCH 26/26] qml tool: Use QCommandLineParser::process() rather than + parse() + +This handles the --version, --help and --help-all options. +Apparently there's no other way to handle --help-all, because +addHelpOption() adds two options but only returns one of them. +Amends bb6602bca2b20d98f24320b10c7a039e605c9a05 + +Fixes: QTBUG-100678 +Pick-to: 6.2 6.5 5.15 +Change-Id: Iddd1ba2dae975d7256935d8d357e2f3ac6c013d6 +Reviewed-by: Ulf Hermann +(cherry picked from commit e5007fcc43af6751c72ec970eed11df5fdb8638e) + +* asturmlechner 2023-05-18: Resolve conflict with dev branch commit + a15472716dbef63f1e5ad27ee412c2a2408b44e2 +--- + tools/qml/main.cpp | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp +index beeec88f07..2cb7653d65 100644 +--- a/tools/qml/main.cpp ++++ b/tools/qml/main.cpp +@@ -446,8 +446,8 @@ int main(int argc, char *argv[]) + QCommandLineParser parser; + parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); + parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsPositionalArguments); +- const QCommandLineOption helpOption = parser.addHelpOption(); +- const QCommandLineOption versionOption = parser.addVersionOption(); ++ parser.addHelpOption(); ++ parser.addVersionOption(); + #ifdef QT_GUI_LIB + QCommandLineOption apptypeOption(QStringList() << QStringLiteral("a") << QStringLiteral("apptype"), + QCoreApplication::translate("main", "Select which application class to use. Default is gui."), +@@ -522,14 +522,7 @@ int main(int argc, char *argv[]) + parser.addPositionalArgument("args", + QCoreApplication::translate("main", "Arguments after '--' are ignored, but passed through to the application.arguments variable in QML."), "[-- args...]"); + +- if (!parser.parse(QCoreApplication::arguments())) { +- qWarning() << parser.errorText(); +- exit(1); +- } +- if (parser.isSet(versionOption)) +- parser.showVersion(); +- if (parser.isSet(helpOption)) +- parser.showHelp(); ++ parser.process(*app); + if (parser.isSet(listConfOption)) + listConfFiles(); + if (applicationType == QmlApplicationTypeUnknown) { +-- +2.40.1 + diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index ce3f88a..f6a3e95 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} -Version: 5.15.9 +Version: 5.15.10 Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details @@ -27,16 +27,16 @@ Source5: qv4global_p-multilib.h ## upstream patches ## repo: https://invent.kde.org/qt/qt/qtdeclarative ## branch: kde/5.15 -## git format-patch v5.15.9-lts-lgpl -Patch1: 0001-Remove-unused-QPointer-QQuickPointerMask.patch -Patch2: 0002-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch -Patch3: 0003-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch -Patch4: 0004-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch -Patch5: 0005-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch -Patch6: 0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch -Patch7: 0007-Don-t-convert-QByteArray-in-startDrag.patch -Patch8: 0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch -Patch9: 0009-Implement-accessibility-for-QQuickWidget.patch +## git format-patch v5.15.10-lts-lgpl +Patch1: 0001-Remove-unused-QPointer-QQuickPointerMask.patch +Patch2: 0002-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch +Patch3: 0003-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch +Patch4: 0004-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch +Patch5: 0005-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch +Patch6: 0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch +Patch7: 0007-Don-t-convert-QByteArray-in-startDrag.patch +Patch8: 0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch +Patch9: 0009-Implement-accessibility-for-QQuickWidget.patch Patch10: 0010-Send-ObjectShow-event-for-visible-components-after-i.patch Patch11: 0011-QQuickItem-avoid-emitting-signals-during-destruction.patch Patch12: 0012-a11y-track-item-enabled-state.patch @@ -47,6 +47,13 @@ Patch16: 0016-Revert-Fix-missing-glyphs-when-using-NativeRendering.patch Patch17: 0017-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch Patch18: 0018-QQuickState-when-handle-QJSValue-properties-correctl.patch Patch19: 0019-Models-Avoid-crashes-when-deleting-cache-items.patch +Patch20: 0020-qv4function-Fix-crash-due-to-reference-being-invalid.patch +Patch21: 0021-Quick-Animations-Fix-crash.patch +Patch22: 0022-Prevent-crash-when-destroying-asynchronous-Loader.patch +Patch23: 0023-QQuickItem-Fix-effective-visibility-for-items-withou.patch +Patch24: 0024-Revert-QQuickItem-Fix-effective-visibility-for-items.patch +Patch25: 0025-Accessibility-respect-value-in-attached-Accessible-i.patch +Patch26: 0026-qml-tool-Use-QCommandLineParser-process-rather-than-.patch ## upstreamable patches @@ -233,6 +240,9 @@ make check -k -C tests ||: %changelog +* Mon Jun 12 2023 Jan Grulich - 5.15.10-1 +- 5.15.10 + * Tue Apr 11 2023 Jan Grulich - 5.15.9-1 - 5.15.9 diff --git a/sources b/sources index f47312c..1610a70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz) = ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7 +SHA512 (qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz) = 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8