[neon/qt/qtquickcontrols2/Neon/unstable] debian: Drop patches that are included in the new release.
Dmitry Shachnev
null at kde.org
Mon Apr 29 17:44:21 BST 2024
Git commit 912b3ac3ee96c28c668739e19dddd32151b1fb8f by Dmitry Shachnev.
Committed on 22/04/2023 at 16:08.
Pushed by jriddell into branch 'Neon/unstable'.
Drop patches that are included in the new release.
M +3 -0 debian/changelog
D +0 -44 debian/patches/0003-QQuickAction-don-t-grab-the-same-shortcut-multiple-t.patch
D +0 -80 debian/patches/0004-QQuickAbstractButton-fix-crash-on-destruction.patch
M +0 -2 debian/patches/series
https://invent.kde.org/neon/qt/qtquickcontrols2/-/commit/912b3ac3ee96c28c668739e19dddd32151b1fb8f
diff --git a/debian/changelog b/debian/changelog
index d4e7b2a..681cd04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtquickcontrols2-opensource-src (5.15.9+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
* Bump Qt build-dependencies to 5.15.9.
+ * Drop patches that are included in the new release:
+ - 0003-QQuickAction-don-t-grab-the-same-shortcut-multiple-t.patch
+ - 0004-QQuickAbstractButton-fix-crash-on-destruction.patch
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 22 Apr 2023 16:58:11 +0300
diff --git a/debian/patches/0003-QQuickAction-don-t-grab-the-same-shortcut-multiple-t.patch b/debian/patches/0003-QQuickAction-don-t-grab-the-same-shortcut-multiple-t.patch
deleted file mode 100644
index a42afa2..0000000
--- a/debian/patches/0003-QQuickAction-don-t-grab-the-same-shortcut-multiple-t.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5ac8f83ed1d34712d11a6b75a5bb1f877b24706a Mon Sep 17 00:00:00 2001
-From: Oliver Eftevaag <oliver.eftevaag at qt.io>
-Date: Wed, 19 Jan 2022 22:09:56 +0100
-Subject: [PATCH] QQuickAction: don't grab the same shortcut multiple times
-
-If the entry for the QQuickItem that the QQuickAction is set on has
-already grabbed the shortcut, then m_shortcutId is no longer 0 and we
-must not overwrite the value. Otherwise, the QQuickItem removing itself
-from the action might not remove the correct entry from Qt's shortcut
-map, leaving a dangling pointer behind.
-
-Multiple calls to QQuickActionPrivate::ShortcutEntry::grab are possible,
-because we grab the shortcut whenever the shortcut changes, or when an
-item representing the action becomes visible.
-
-The test case added reproduces this scenario by adding the action to a
-menu item and then making the menu explicitly visible, resulting in two
-calls to grab() which should be idempotent.
-
-Fixes: QTBUG-96551
-Fixes: QTBUG-96561
-Pick-to: 6.2
-Change-Id: I7d42a4f4c04f7d8759f2d0f24a133720f10e4c47
-Reviewed-by: Mitch Curtis <mitch.curtis at qt.io>
-Reviewed-by: Jarkko Koivikko <jarkko.koivikko at code-q.fi>
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer at qt.io>
-
-(cherry picked from commit 45af5ef2f63704adc515e29260ad8c6aaf51f08e in
-qtdeclarative)
----
- src/quicktemplates2/qquickaction.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/quicktemplates2/qquickaction.cpp
-+++ b/src/quicktemplates2/qquickaction.cpp
-@@ -145,7 +145,7 @@ int QQuickActionPrivate::ShortcutEntry::shortcutId() const
-
- void QQuickActionPrivate::ShortcutEntry::grab(const QKeySequence &shortcut, bool enabled)
- {
-- if (shortcut.isEmpty())
-+ if (shortcut.isEmpty() || m_shortcutId)
- return;
-
- Qt::ShortcutContext context = Qt::WindowShortcut; // TODO
diff --git a/debian/patches/0004-QQuickAbstractButton-fix-crash-on-destruction.patch b/debian/patches/0004-QQuickAbstractButton-fix-crash-on-destruction.patch
deleted file mode 100644
index e9c134a..0000000
--- a/debian/patches/0004-QQuickAbstractButton-fix-crash-on-destruction.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 38dbeb8f5aa346f490003c75d9fa6e4b817f5bc8 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann at qt.io>
-Date: Tue, 11 Jan 2022 12:42:47 +0100
-Subject: [PATCH] QQuickAbstractButton: fix crash on destruction
-
-If we listen for size changes we also need to remove the object listened
-to when it's deleted.
-
-Pick-to: 5.15 6.2 6.3
-Fixes: QTBUG-99644
-Change-Id: I613855ebd986b1e67685088020b88d8b070659cf
-Reviewed-by: Mitch Curtis <mitch.curtis at qt.io>
-(cherry picked from commit 720ffaeb60d43123522066e1de3a69ad551644aa in
-qtdeclarative)
----
- src/quicktemplates2/qquickabstractbutton.cpp | 11 +++++++++
- .../qquickabstractbutton_p_p.h | 1 +
- tests/auto/controls/data/tst_switch.qml | 23 +++++++++++++++++++
- 3 files changed, 35 insertions(+)
-
---- a/src/quicktemplates2/qquickabstractbutton.cpp
-+++ b/src/quicktemplates2/qquickabstractbutton.cpp
-@@ -387,6 +387,17 @@ void QQuickAbstractButtonPrivate::itemImplicitHeightChanged(QQuickItem *item)
- emit q->implicitIndicatorHeightChanged();
- }
-
-+void QQuickAbstractButtonPrivate::itemDestroyed(QQuickItem *item)
-+{
-+ Q_Q(QQuickAbstractButton);
-+ QQuickControlPrivate::itemDestroyed(item);
-+ if (item == indicator) {
-+ indicator = nullptr;
-+ emit q->implicitIndicatorWidthChanged();
-+ emit q->implicitIndicatorHeightChanged();
-+ }
-+}
-+
- QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const
- {
- Q_Q(const QQuickAbstractButton);
---- a/src/quicktemplates2/qquickabstractbutton_p_p.h
-+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
-@@ -109,6 +109,7 @@ public:
-
- void itemImplicitWidthChanged(QQuickItem *item) override;
- void itemImplicitHeightChanged(QQuickItem *item) override;
-+ void itemDestroyed(QQuickItem *item) override;
-
- // copied from qabstractbutton.cpp
- static const int AUTO_REPEAT_DELAY = 300;
---- a/tests/auto/controls/data/tst_switch.qml
-+++ b/tests/auto/controls/data/tst_switch.qml
-@@ -608,4 +608,27 @@ TestCase {
- mouseClick(control.indicator)
- verify(control.activeFocus)
- }
-+
-+ Component {
-+ id: deletionOrder1
-+ Item {
-+ Image { id: innerImage }
-+ Switch { indicator: innerImage }
-+ }
-+ }
-+
-+ Component {
-+ id: deletionOrder2
-+ Item {
-+ Switch { indicator: innerImage }
-+ Image { id: innerImage }
-+ }
-+ }
-+
-+ function test_deletionOrder() {
-+ var control1 = createTemporaryObject(deletionOrder1, testCase)
-+ verify(control1)
-+ var control2 = createTemporaryObject(deletionOrder2, testCase)
-+ verify(control2)
-+ }
- }
diff --git a/debian/patches/series b/debian/patches/series
index de05f3f..dae04a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
0001-Unset-mouseGrabberPopup-if-it-s-removed-from-childre.patch
0002-Ensure-we-don-t-crash-when-changing-sizes-after-clea.patch
-0003-QQuickAction-don-t-grab-the-same-shortcut-multiple-t.patch
-0004-QQuickAbstractButton-fix-crash-on-destruction.patch
0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch
0007-implement-a11y-pressing-of-qquickabstractbutton.patch
0008-Fix-the-popup-position-of-a-Menu.patch
More information about the Neon-commits
mailing list