From 9da807d551f2b5f5fe6c179ce1703114d5730a66 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Jan 02 2024 16:40:31 +0000 Subject: 5.15.12 --- diff --git a/.gitignore b/.gitignore index 0a5ddbd..dac2aee 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz /qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz /qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz +/qtdeclarative-everywhere-opensource-src-5.15.12.tar.xz diff --git a/0001-Remove-unused-QPointer-QQuickPointerMask.patch b/0001-Remove-unused-QPointer-QQuickPointerMask.patch index a7d74c4..660367d 100644 --- a/0001-Remove-unused-QPointer-QQuickPointerMask.patch +++ b/0001-Remove-unused-QPointer-QQuickPointerMask.patch @@ -1,7 +1,7 @@ -From 72c7590b4ede25b2a4fe90847a6c4350e21c6fe9 Mon Sep 17 00:00:00 2001 +From 7016d7eecf480742a77f5976bdf3be30c948ee4f Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 17 Jun 2021 16:32:28 +0200 -Subject: [PATCH 01/30] Remove unused QPointer +Subject: [PATCH 01/31] Remove unused QPointer Change-Id: I009fa6bbd8599dc3bb2e810176fe20e70ed50851 Reviewed-by: Shawn Rutledge @@ -31,5 +31,5 @@ index fba383e268..0d63618622 100644 QPointF targetStartPos; QPointF lastPos; -- -2.41.0 +2.43.0 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 53f937d..a638597 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 51b5565f2647e4c0f298c75e7566252d230e1ba6 Mon Sep 17 00:00:00 2001 +From 2ca22f3e3989189ee3f6cf55a141de3ee9b4910a Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 23 Sep 2021 03:43:04 +0200 -Subject: [PATCH 02/30] QQmlDelegateModel: Refresh the view when a column is +Subject: [PATCH 02/31] 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 @@ -174,5 +174,5 @@ index 35f1e2c94d..1722447830 100644 #include "tst_qqmldelegatemodel.moc" -- -2.41.0 +2.43.0 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 c232abc..1dbf733 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 e3e008d519effe76dc0706ce6a9546ee302644f3 Mon Sep 17 00:00:00 2001 +From ab7d65e2830204923dea957f9e7541c1473c2e15 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/30] Fix TapHandler so that it actually registers a tap +Subject: [PATCH 03/31] Fix TapHandler so that it actually registers a tap This bug caused all quick examples that used the shared\LauncherList.qml to be broken. @@ -69,5 +69,5 @@ index d785d8c0ca..a508de455d 100644 void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event) -- -2.41.0 +2.43.0 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 4406c2a..3d82a46 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 e58a94011ac612496b48b76684f8271d11b98ff0 Mon Sep 17 00:00:00 2001 +From b24fd08576e3d16972fd45acb49498ee7125ded4 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 16 Nov 2021 22:43:37 +0100 -Subject: [PATCH 04/30] Revert "Fix TapHandler so that it actually registers a +Subject: [PATCH 04/31] Revert "Fix TapHandler so that it actually registers a tap" This reverts commit 36e8ccd434f948e4f11a8f9d59139ec072e41ff5. @@ -57,5 +57,5 @@ index a508de455d..d785d8c0ca 100644 void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event) -- -2.41.0 +2.43.0 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 1178f12..deb3654 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 1a7956f606047d4ec669f5759f88d7f34a912589 Mon Sep 17 00:00:00 2001 +From 09215824f075813f9f09bbf840d1c367e9a3981e Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sat, 29 Jan 2022 21:59:33 +0200 -Subject: [PATCH 05/30] Make sure QQuickWidget and its offscreen window's +Subject: [PATCH 05/31] 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 cf021d9a7c..c791f209cf 100644 case QEvent::Move: d->updatePosition(); -- -2.41.0 +2.43.0 diff --git a/0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch b/0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch index a2e8f91..8756ca5 100644 --- a/0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch +++ b/0006-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch @@ -1,7 +1,7 @@ -From 8fd89860de65760e082e5b9cb2bbfabfe5df309b Mon Sep 17 00:00:00 2001 +From ce3c5cfe80af706a9f6cdd2e104b2084652ecb9a Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 4 May 2022 09:10:54 +0200 -Subject: [PATCH 06/30] QQuickItem: Guard against cycles in +Subject: [PATCH 06/31] 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.41.0 +2.43.0 diff --git a/0007-Don-t-convert-QByteArray-in-startDrag.patch b/0007-Don-t-convert-QByteArray-in-startDrag.patch index 638f6d9..1aafff2 100644 --- a/0007-Don-t-convert-QByteArray-in-startDrag.patch +++ b/0007-Don-t-convert-QByteArray-in-startDrag.patch @@ -1,7 +1,7 @@ -From c416839e41ac65cd559176617525a3fb26ca6e2a Mon Sep 17 00:00:00 2001 +From f649d275573776430f96925fae72484b1e23736b Mon Sep 17 00:00:00 2001 From: Fushan Wen Date: Tue, 1 Nov 2022 22:35:24 +0800 -Subject: [PATCH 07/30] Don't convert QByteArray in `startDrag` +Subject: [PATCH 07/31] 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.41.0 +2.43.0 diff --git a/0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch b/0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch index 7b8c087..8ec4757 100644 --- a/0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch +++ b/0008-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch @@ -1,7 +1,7 @@ -From 21b1f493febf597b5a4c268970a5285436435466 Mon Sep 17 00:00:00 2001 +From c35e027d995273039560b7bd27692456371ff410 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Sat, 5 Nov 2022 18:48:41 +0100 -Subject: [PATCH 08/30] Fix build after +Subject: [PATCH 08/31] Fix build after 95290f66b806a307b8da1f72f8fc2c69801933d0 --- @@ -22,5 +22,5 @@ index 3b50370355..383078b3b9 100644 else mimeData->setData(it.key(), it.value().toString().toUtf8()); -- -2.41.0 +2.43.0 diff --git a/0009-Implement-accessibility-for-QQuickWidget.patch b/0009-Implement-accessibility-for-QQuickWidget.patch index 8931c80..4958b2a 100644 --- a/0009-Implement-accessibility-for-QQuickWidget.patch +++ b/0009-Implement-accessibility-for-QQuickWidget.patch @@ -1,7 +1,7 @@ -From e88fbf0d32d56eea40c8aec75e81b40f21c581a5 Mon Sep 17 00:00:00 2001 +From aa6bfe0a049c21de1e324c2ce8d52297a3e94457 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/30] Implement accessibility for QQuickWidget +Subject: [PATCH 09/31] 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.41.0 +2.43.0 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 4e4c486..66a8311 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 1d44e89e1ec8a8b9d68035b0cb379dc698673c41 Mon Sep 17 00:00:00 2001 +From bf7746136fee8f1f84338479fd220116e9ebe920 Mon Sep 17 00:00:00 2001 From: Fushan Wen Date: Sat, 5 Nov 2022 01:44:30 +0800 -Subject: [PATCH 10/30] Send ObjectShow event for visible components after +Subject: [PATCH 10/31] 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.41.0 +2.43.0 diff --git a/0011-QQuickItem-avoid-emitting-signals-during-destruction.patch b/0011-QQuickItem-avoid-emitting-signals-during-destruction.patch index ac36fc8..29d8447 100644 --- a/0011-QQuickItem-avoid-emitting-signals-during-destruction.patch +++ b/0011-QQuickItem-avoid-emitting-signals-during-destruction.patch @@ -1,7 +1,7 @@ -From 5e53b663378216edbaef243d4e91eaaf45d39e61 Mon Sep 17 00:00:00 2001 +From a74448f8d5b2aa443479561e86b84903e69fe92d Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 9 Nov 2022 15:34:11 +0100 -Subject: [PATCH 11/30] QQuickItem: avoid emitting signals during destruction +Subject: [PATCH 11/31] 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.41.0 +2.43.0 diff --git a/0012-a11y-track-item-enabled-state.patch b/0012-a11y-track-item-enabled-state.patch index 05eed64..ce11910 100644 --- a/0012-a11y-track-item-enabled-state.patch +++ b/0012-a11y-track-item-enabled-state.patch @@ -1,7 +1,7 @@ -From 3fcbf3c50d392401060d4ea65e9bc2f4760ebda3 Mon Sep 17 00:00:00 2001 +From fc4a4b544f79b5a8ad37d73f33eb25ad421214be Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Mon, 28 Nov 2022 14:59:33 +0100 -Subject: [PATCH 12/30] a11y: track item enabled state +Subject: [PATCH 12/31] 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.41.0 +2.43.0 diff --git a/0013-Make-QaccessibleQuickWidget-private-API.patch b/0013-Make-QaccessibleQuickWidget-private-API.patch index 8d3e8c9..e728de7 100644 --- a/0013-Make-QaccessibleQuickWidget-private-API.patch +++ b/0013-Make-QaccessibleQuickWidget-private-API.patch @@ -1,7 +1,7 @@ -From 4623a7384e6c16b2b5493cbdb9e9d5fcd39a36a5 Mon Sep 17 00:00:00 2001 +From 16c9b9541bf208f937a661e31231da8ce5757e68 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Tue, 1 Jun 2021 16:40:44 +0200 -Subject: [PATCH 13/30] Make QaccessibleQuickWidget private API +Subject: [PATCH 13/31] 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.41.0 +2.43.0 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 ecba269..b8788d6 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 63fbc2eac56cc0df72bbe4287e777e8db334db96 Mon Sep 17 00:00:00 2001 +From e72d3772d57573dd9865370c925345045ecdce69 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 30 Nov 2021 14:39:48 +0100 -Subject: [PATCH 14/30] Qml: Don't crash when as-casting to type with errors +Subject: [PATCH 14/31] 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. @@ -75,7 +75,7 @@ index 0000000000..bd88d14c76 + property var selfAsBroken: self as Broken +} diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp -index 1be1533b63..dfc82011c6 100644 +index ac6634290a..d16d117d65 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -337,6 +337,7 @@ private slots: @@ -86,8 +86,8 @@ index 1be1533b63..dfc82011c6 100644 void ambiguousContainingType(); void staticConstexprMembers(); -@@ -5939,6 +5940,21 @@ void tst_qqmllanguage::bindingAliasToComponentUrl() - } +@@ -5951,6 +5952,21 @@ void tst_qqmllanguage::badGroupedProperty() + .arg(url.toString())); } +void tst_qqmllanguage::objectAsBroken() @@ -109,5 +109,5 @@ index 1be1533b63..dfc82011c6 100644 #include "tst_qqmllanguage.moc" -- -2.41.0 +2.43.0 diff --git a/0015-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch b/0015-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch index e1296f9..ae41c35 100644 --- a/0015-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch +++ b/0015-QQmlImportDatabase-Make-sure-the-newly-added-import-.patch @@ -1,7 +1,7 @@ -From 752b5bfa37c0b059883f52fcec4a41efc78521ad Mon Sep 17 00:00:00 2001 +From c8d7e8ac22001a0615a2729e74e98e575614e538 Mon Sep 17 00:00:00 2001 From: Jaeyoon Jung Date: Fri, 19 Feb 2021 08:11:57 +0900 -Subject: [PATCH 15/30] QQmlImportDatabase: Make sure the newly added import +Subject: [PATCH 15/31] 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.41.0 +2.43.0 diff --git a/0016-QQuickState-when-handle-QJSValue-properties-correctl.patch b/0016-QQuickState-when-handle-QJSValue-properties-correctl.patch index c0e003a..21f5f4b 100644 --- a/0016-QQuickState-when-handle-QJSValue-properties-correctl.patch +++ b/0016-QQuickState-when-handle-QJSValue-properties-correctl.patch @@ -1,7 +1,7 @@ -From d790abcf04fde46d1d8ecdf8268a1a71c085c651 Mon Sep 17 00:00:00 2001 +From 0ab5784208ee7c531933ff36200998e8ff494465 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 20 Jul 2022 11:44:43 +0200 -Subject: [PATCH 16/30] QQuickState::when: handle QJSValue properties correctly +Subject: [PATCH 16/31] 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.41.0 +2.43.0 diff --git a/0017-Models-Avoid-crashes-when-deleting-cache-items.patch b/0017-Models-Avoid-crashes-when-deleting-cache-items.patch index 4f4fb81..8ec7585 100644 --- a/0017-Models-Avoid-crashes-when-deleting-cache-items.patch +++ b/0017-Models-Avoid-crashes-when-deleting-cache-items.patch @@ -1,7 +1,7 @@ -From 4e9cc24046159483e47142cadbf432ff5d76981d Mon Sep 17 00:00:00 2001 +From 86bea17b50567c95143a72609cea1712dabd784d Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 29 Mar 2023 16:36:03 +0200 -Subject: [PATCH 17/30] Models: Avoid crashes when deleting cache items +Subject: [PATCH 17/31] Models: Avoid crashes when deleting cache items Pick-to: 6.5 6.2 5.15 Fixes: QTBUG-91425 @@ -158,5 +158,5 @@ index 1722447830..f473cff75f 100644 #include "tst_qqmldelegatemodel.moc" -- -2.41.0 +2.43.0 diff --git a/0018-qv4function-Fix-crash-due-to-reference-being-invalid.patch b/0018-qv4function-Fix-crash-due-to-reference-being-invalid.patch index 3e4e719..9c358ca 100644 --- a/0018-qv4function-Fix-crash-due-to-reference-being-invalid.patch +++ b/0018-qv4function-Fix-crash-due-to-reference-being-invalid.patch @@ -1,7 +1,7 @@ -From be8e5e55717acafa3c4f3d0368b4a9b1e8f6b862 Mon Sep 17 00:00:00 2001 +From d6ac99557834f4ab7dad6c366598a58475b44375 Mon Sep 17 00:00:00 2001 From: Maximilian Goldstein Date: Wed, 9 Jun 2021 15:02:45 +0200 -Subject: [PATCH 18/30] qv4function: Fix crash due to reference being +Subject: [PATCH 18/31] qv4function: Fix crash due to reference being invalidated Function::updateInternalClass creates a reference to a QStringList that is appended to before being used. @@ -31,5 +31,5 @@ index cf8a53cf9f..223e64271e 100644 parameterNames[duplicate] = QString(0xfffe) + QString::number(duplicate) + dup; -- -2.41.0 +2.43.0 diff --git a/0019-Quick-Animations-Fix-crash.patch b/0019-Quick-Animations-Fix-crash.patch index 9279f8f..0dae1b8 100644 --- a/0019-Quick-Animations-Fix-crash.patch +++ b/0019-Quick-Animations-Fix-crash.patch @@ -1,7 +1,7 @@ -From 9c97a85fbec3d6ad40cdae00a06bac1fc8c06665 Mon Sep 17 00:00:00 2001 +From 97f0a7cffa5675999307507aef1b81f03c3522cb Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Tue, 29 Mar 2022 10:44:04 +0200 -Subject: [PATCH 19/30] Quick Animations: Fix crash +Subject: [PATCH 19/31] 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 @@ -137,5 +137,5 @@ index 0000000000..38dfde41c3 + } +} -- -2.41.0 +2.43.0 diff --git a/0020-Prevent-crash-when-destroying-asynchronous-Loader.patch b/0020-Prevent-crash-when-destroying-asynchronous-Loader.patch index dd2ef6b..eb3a5b2 100644 --- a/0020-Prevent-crash-when-destroying-asynchronous-Loader.patch +++ b/0020-Prevent-crash-when-destroying-asynchronous-Loader.patch @@ -1,7 +1,7 @@ -From 3e199737af8faee64cb940aef904537b658fe375 Mon Sep 17 00:00:00 2001 +From f0039fae9be6c075cac2913fc47c805c89590c84 Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Thu, 3 Sep 2020 14:22:26 +0300 -Subject: [PATCH 20/30] Prevent crash when destroying asynchronous Loader +Subject: [PATCH 20/31] Prevent crash when destroying asynchronous Loader Fixes: QTBUG-86255 Pick-to: 5.15 @@ -125,5 +125,5 @@ index 94ec4f44d5..7d0d9fa7a7 100644 { QScopedPointer view(createView()); -- -2.41.0 +2.43.0 diff --git a/0021-QQuickItem-Fix-effective-visibility-for-items-withou.patch b/0021-QQuickItem-Fix-effective-visibility-for-items-withou.patch index c6a9d03..c1d57df 100644 --- a/0021-QQuickItem-Fix-effective-visibility-for-items-withou.patch +++ b/0021-QQuickItem-Fix-effective-visibility-for-items-withou.patch @@ -1,7 +1,7 @@ -From 632e062466b5252049b3bf1d75c91d5e010f021c Mon Sep 17 00:00:00 2001 +From 83bacb179a195f099032227553e64f089ea3b601 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 18 Nov 2022 14:20:20 +0100 -Subject: [PATCH 21/30] QQuickItem: Fix effective visibility for items without +Subject: [PATCH 21/31] QQuickItem: Fix effective visibility for items without parent Items are visible if they are children of a visible parent, and not @@ -77,5 +77,5 @@ index 42348d8dd1..34eefd85e6 100644 QQuickItem *child1 = new QQuickItem; child1->setParentItem(root); -- -2.41.0 +2.43.0 diff --git a/0022-Revert-QQuickItem-Fix-effective-visibility-for-items.patch b/0022-Revert-QQuickItem-Fix-effective-visibility-for-items.patch index edadc7b..e53208a 100644 --- a/0022-Revert-QQuickItem-Fix-effective-visibility-for-items.patch +++ b/0022-Revert-QQuickItem-Fix-effective-visibility-for-items.patch @@ -1,7 +1,7 @@ -From 75d7d0370a3a19615e9aab6a23519eb529e4de87 Mon Sep 17 00:00:00 2001 +From 2f7c659b2c82ea10017879ea5ac44a6c5c60505c Mon Sep 17 00:00:00 2001 From: Fushan Wen Date: Fri, 21 Apr 2023 23:38:04 +0800 -Subject: [PATCH 22/30] Revert "QQuickItem: Fix effective visibility for items +Subject: [PATCH 22/31] Revert "QQuickItem: Fix effective visibility for items without parent" This breaks applications that use QQmlPropertyList to store QQuickItem @@ -47,5 +47,5 @@ index 34eefd85e6..42348d8dd1 100644 QQuickItem *child1 = new QQuickItem; child1->setParentItem(root); -- -2.41.0 +2.43.0 diff --git a/0023-Accessibility-respect-value-in-attached-Accessible-i.patch b/0023-Accessibility-respect-value-in-attached-Accessible-i.patch index d5e2a91..1af559e 100644 --- a/0023-Accessibility-respect-value-in-attached-Accessible-i.patch +++ b/0023-Accessibility-respect-value-in-attached-Accessible-i.patch @@ -1,7 +1,7 @@ -From be69e9b1443cff30d241100bafc91d447cc0b2f5 Mon Sep 17 00:00:00 2001 +From c1b619559487bf3e76ecb0a91515fb9cdf6d3548 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 18 Apr 2023 22:05:36 +0200 -Subject: [PATCH 23/30] Accessibility: respect value in attached Accessible in +Subject: [PATCH 23/31] Accessibility: respect value in attached Accessible in controls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -107,5 +107,5 @@ index ade8fb61f2..6f329bd119 100644 void setImplicitAntialiasing(bool antialiasing); -- -2.41.0 +2.43.0 diff --git a/0024-qml-tool-Use-QCommandLineParser-process-rather-than-.patch b/0024-qml-tool-Use-QCommandLineParser-process-rather-than-.patch index b97d046..7410531 100644 --- a/0024-qml-tool-Use-QCommandLineParser-process-rather-than-.patch +++ b/0024-qml-tool-Use-QCommandLineParser-process-rather-than-.patch @@ -1,7 +1,7 @@ -From f2e8ebd9e19e0d725c820010ab3cdf153fd62a3b Mon Sep 17 00:00:00 2001 +From cb688518d44ff4cf61773cdc8cfe2275ce45f6a3 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 16 May 2023 07:59:46 +0200 -Subject: [PATCH 24/30] qml tool: Use QCommandLineParser::process() rather than +Subject: [PATCH 24/31] qml tool: Use QCommandLineParser::process() rather than parse() This handles the --version, --help and --help-all options. @@ -53,5 +53,5 @@ index beeec88f07..2cb7653d65 100644 listConfFiles(); if (applicationType == QmlApplicationTypeUnknown) { -- -2.41.0 +2.43.0 diff --git a/0025-JIT-Add-missing-STORE-LOAD-_ACC-to-CreateCallContext.patch b/0025-JIT-Add-missing-STORE-LOAD-_ACC-to-CreateCallContext.patch index c5dc363..a61d8f4 100644 --- a/0025-JIT-Add-missing-STORE-LOAD-_ACC-to-CreateCallContext.patch +++ b/0025-JIT-Add-missing-STORE-LOAD-_ACC-to-CreateCallContext.patch @@ -1,7 +1,7 @@ -From cbfce7fd236c5305d85371c058a34f8f25e949fa Mon Sep 17 00:00:00 2001 +From ac79fc4ad54fd0cfaf7963c41bb9cd982a76ba4f Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 15 Mar 2023 08:59:43 +0100 -Subject: [PATCH 25/30] JIT: Add missing {STORE|LOAD}_ACC() to +Subject: [PATCH 25/31] JIT: Add missing {STORE|LOAD}_ACC() to CreateCallContext We cannot assume anything about the accumulator register after calling @@ -45,5 +45,5 @@ index 45150cfffd..5ad53faf95 100644 void BaselineJIT::generate_PushCatchContext(int index, int name) { as->pushCatchContext(index, name); } -- -2.41.0 +2.43.0 diff --git a/0026-QQmlJs-MemoryPool-fix-potential-UB-pointer-overflow.patch b/0026-QQmlJs-MemoryPool-fix-potential-UB-pointer-overflow.patch index cb672fc..1115a16 100644 --- a/0026-QQmlJs-MemoryPool-fix-potential-UB-pointer-overflow.patch +++ b/0026-QQmlJs-MemoryPool-fix-potential-UB-pointer-overflow.patch @@ -1,7 +1,7 @@ -From 7368a55a926719577c36e5978d67c008474a85a0 Mon Sep 17 00:00:00 2001 +From 48329d973115d8be1260ee4a47cb5870ebc827a1 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 27 Jun 2023 13:02:45 +0200 -Subject: [PATCH 26/30] QQmlJs::MemoryPool: fix potential UB (pointer overflow) +Subject: [PATCH 26/31] QQmlJs::MemoryPool: fix potential UB (pointer overflow) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -41,5 +41,5 @@ index 0cf7ea84e6..1b81a87a2c 100644 _ptr += size; return addr; -- -2.41.0 +2.43.0 diff --git a/0027-QRecyclePool-fix-potential-UB.patch b/0027-QRecyclePool-fix-potential-UB.patch index 590494f..a390632 100644 --- a/0027-QRecyclePool-fix-potential-UB.patch +++ b/0027-QRecyclePool-fix-potential-UB.patch @@ -1,7 +1,7 @@ -From d15af4ca5c7b94b1ce1fa202c33e5dc1640185c7 Mon Sep 17 00:00:00 2001 +From c3bc84a6b6d3c32cd1295e51c432446145c36332 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 26 Jun 2023 11:00:56 +0200 -Subject: [PATCH 27/30] QRecyclePool: fix potential UB +Subject: [PATCH 27/31] QRecyclePool: fix potential UB Return the pointer returned by placement new, not the pointer used as input to placement new. There is a subtle difference and this grey @@ -50,5 +50,5 @@ index 39f4f88512..c963e1878e 100644 template -- -2.41.0 +2.43.0 diff --git a/0028-QtQml-Clean-up-QQmlData-ctor.patch b/0028-QtQml-Clean-up-QQmlData-ctor.patch index 6fb4d89..3dd5a1d 100644 --- a/0028-QtQml-Clean-up-QQmlData-ctor.patch +++ b/0028-QtQml-Clean-up-QQmlData-ctor.patch @@ -1,7 +1,7 @@ -From 6d290336ef7c65041c7f6eb9b5094f6c4de5f845 Mon Sep 17 00:00:00 2001 +From 9d5d1f40f989f7061c6d007c6388b5bb5fdc1b89 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 10 Jul 2023 07:43:28 +0200 -Subject: [PATCH 28/30] QtQml: Clean up QQmlData ctor +Subject: [PATCH 28/31] QtQml: Clean up QQmlData ctor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -107,5 +107,5 @@ index 852a673ebd..86a2d2b45a 100644 memset(bindingBitsValue, 0, sizeof(bindingBitsValue)); init(); -- -2.41.0 +2.43.0 diff --git a/0029-QML-Make-notify-list-thread-safe.patch b/0029-QML-Make-notify-list-thread-safe.patch index b45eebc..f56e319 100644 --- a/0029-QML-Make-notify-list-thread-safe.patch +++ b/0029-QML-Make-notify-list-thread-safe.patch @@ -1,7 +1,7 @@ -From 9f029563b151eb4a41f9b548376093e288aa0331 Mon Sep 17 00:00:00 2001 +From ebcd50c250754ed31a55de2566413b5fd3a6de36 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 8 Aug 2023 14:54:01 +0200 -Subject: [PATCH 29/30] QML: Make notify list thread safe +Subject: [PATCH 29/31] QML: Make notify list thread safe We keep the notifyList itself alive until the QQmlData itself is deleted. This way any isSignalConnected() called while an @@ -273,5 +273,5 @@ index 86a2d2b45a..d6b2711c2d 100644 if (extendedData) delete extendedData; -- -2.41.0 +2.43.0 diff --git a/0030-Flickable-prevent-fixup-from-being-called-while-drag.patch b/0030-Flickable-prevent-fixup-from-being-called-while-drag.patch index 7647c04..85c9893 100644 --- a/0030-Flickable-prevent-fixup-from-being-called-while-drag.patch +++ b/0030-Flickable-prevent-fixup-from-being-called-while-drag.patch @@ -1,7 +1,7 @@ -From 1b0e366092bcfae0392592c3b7891f0e47af1018 Mon Sep 17 00:00:00 2001 +From aa66aa90e868381393f7fd492f7b7ee318e61716 Mon Sep 17 00:00:00 2001 From: Oliver Eftevaag Date: Fri, 9 Dec 2022 18:40:54 +0100 -Subject: [PATCH 30/30] Flickable: prevent fixup() from being called while +Subject: [PATCH 30/31] Flickable: prevent fixup() from being called while dragging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -112,5 +112,5 @@ index d092cd0170..62f7c67dd4 100644 QTest::mouseMove(window.data(), pos); -- -2.41.0 +2.43.0 diff --git a/0031-QML-Fortify-qmlExecuteDeferred-some-more.patch b/0031-QML-Fortify-qmlExecuteDeferred-some-more.patch index f46d758..ef3a96a 100644 --- a/0031-QML-Fortify-qmlExecuteDeferred-some-more.patch +++ b/0031-QML-Fortify-qmlExecuteDeferred-some-more.patch @@ -1,4 +1,4 @@ -From 453b1cb207cf3ce35b906c21c9f04a17d66074a7 Mon Sep 17 00:00:00 2001 +From 792a55bb701d233116c3731c7a53ffdb8c67e407 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 8 Feb 2023 12:14:21 +0100 Subject: [PATCH 31/31] QML: Fortify qmlExecuteDeferred some more @@ -50,5 +50,5 @@ index d6b2711c2d..5f3367e4d2 100644 QQmlContext *qmlContext(const QObject *obj) -- -2.41.0 +2.43.0 diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 13d200c..919d300 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -11,8 +11,8 @@ Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} -Version: 5.15.11 -Release: 2%{?dist} +Version: 5.15.12 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -27,7 +27,7 @@ Source5: qv4global_p-multilib.h ## upstream patches ## repo: https://invent.kde.org/qt/qt/qtdeclarative ## branch: kde/5.15 -## git format-patch v5.15.11-lts-lgpl +## git format-patch v5.15.12-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 @@ -241,6 +241,9 @@ make check -k -C tests ||: %changelog +* Tue Jan 02 2024 Jan Grulich - 5.15.12-1 +- 5.15.12 + * Mon Oct 30 2023 Jan Grulich - 5.15.11-2 - Upstream backport: QML: Fortify qmlExecuteDeferred some more diff --git a/sources b/sources index 2fc628f..481dd97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz) = 08f76c5a1253d6014e48ef8d8c53f65d3087efea0f614f36aa03f37882c6947109b17398ac491157c4fbd0c954762e819c2f074fa5a71e6990f16a54ec7224ae +SHA512 (qtdeclarative-everywhere-opensource-src-5.15.12.tar.xz) = 3ebe195dac22efa2e71a4520e4816592204431bc724d94a38d9f426424624990199f7e99b72c7d96f6ae324bb18b7eec89ea2b5db63ff2f1d24a997be25a0589