[neon/qt/qtquickcontrols2/Neon/unstable] debian: Drop 0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch.
Dmitry Shachnev
null at kde.org
Mon Apr 29 17:44:21 BST 2024
Git commit 5634cec6caa59664087c1a9be291546bee188eda by Dmitry Shachnev.
Committed on 23/12/2023 at 13:45.
Pushed by jriddell into branch 'Neon/unstable'.
Drop 0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch.
Included in the new release.
M +2 -0 debian/changelog
D +0 -168 debian/patches/0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch
M +0 -1 debian/patches/series
https://invent.kde.org/neon/qt/qtquickcontrols2/-/commit/5634cec6caa59664087c1a9be291546bee188eda
diff --git a/debian/changelog b/debian/changelog
index 963362b..538e6af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtquickcontrols2-opensource-src (5.15.12+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
* Bump Qt build-dependencies to 5.15.12.
+ * Drop 0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch,
+ included in the new release.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 23 Dec 2023 16:11:32 +0300
diff --git a/debian/patches/0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch b/debian/patches/0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch
deleted file mode 100644
index 46634e0..0000000
--- a/debian/patches/0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From d0642867ab629daf36a1194274a74758111140be Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis at qt.io>
-Date: Mon, 18 Jul 2022 15:21:49 +0800
-Subject: [PATCH] Fix scroll bars not showing up when binding to standalone
- contentItem
-
-908aa77d16e00f2bccc0ddae0f8b61955c56a6a1 hid old scroll bars, but
-didn't account for the situation where the old scroll bars would be put
-back into place, and so they never showed up.
-
-In the case of the linked bug report, since there was a binding to the
-ScrollView's contentItem, a default Flickable would be created. After
-that binding was evaluated, the contentItem was set, causing the scroll
-bars to be hidden (as part of the process of disconnecting from the old
-flickable). To fix the issue, we now do the reverse of hideOldItem when
-a new contentItem is set.
-
-Fixes: QTBUG-104983
-Pick-to: 6.2 6.3 6.4
-Change-Id: I910259cc3e8f6a6231ae6c87c7d4f0f652bd0545
-Reviewed-by: Fabian Kosmale <fabian.kosmale at qt.io>
-Reviewed-by: Nate Graham
-
-(cherry picked from qtdeclarative 58bae53237417f28eac6d772fa6ecab657f8a73f)
----
- src/quicktemplates2/qquickcontrol.cpp | 30 +++++++++++++
- src/quicktemplates2/qquickcontrol_p_p.h | 1 +
- src/quicktemplates2/qquickscrollbar.cpp | 11 +++++
- tests/auto/controls/data/tst_scrollview.qml | 47 +++++++++++++++++++++
- 4 files changed, 89 insertions(+)
-
---- a/src/quicktemplates2/qquickcontrol.cpp
-+++ b/src/quicktemplates2/qquickcontrol.cpp
-@@ -846,6 +846,13 @@ void QQuickControlPrivate::executeBackground(bool complete)
- quickCompleteDeferred(q, backgroundName(), background);
- }
-
-+/*
-+ \internal
-+
-+ Hides an item that was replaced by a newer one, rather than
-+ deleting it, as the item is typically created in QML and hence
-+ we don't own it.
-+*/
- void QQuickControlPrivate::hideOldItem(QQuickItem *item)
- {
- if (!item)
-@@ -864,6 +871,29 @@ void QQuickControlPrivate::hideOldItem(QQuickItem *item)
- #endif
- }
-
-+/*
-+ \internal
-+
-+ Named "unhide" because it's used for cases where an item
-+ that was previously hidden by \l hideOldItem() wants to be
-+ shown by a control again, such as a ScrollBar in ScrollView.
-+*/
-+void QQuickControlPrivate::unhideOldItem(QQuickControl *control, QQuickItem *item)
-+{
-+ Q_ASSERT(item);
-+ qCDebug(lcItemManagement) << "unhiding old item" << item;
-+
-+ item->setVisible(true);
-+ item->setParentItem(control);
-+
-+#if QT_CONFIG(accessibility)
-+ // Add the item back in to the accessibility tree.
-+ QQuickAccessibleAttached *accessible = accessibleAttached(item);
-+ if (accessible)
-+ accessible->setIgnored(false);
-+#endif
-+}
-+
- void QQuickControlPrivate::updateBaselineOffset()
- {
- Q_Q(QQuickControl);
---- a/src/quicktemplates2/qquickcontrol_p_p.h
-+++ b/src/quicktemplates2/qquickcontrol_p_p.h
-@@ -173,6 +173,7 @@ public:
- virtual void executeBackground(bool complete = false);
-
- static void hideOldItem(QQuickItem *item);
-+ static void unhideOldItem(QQuickControl *control, QQuickItem *item);
-
- void updateBaselineOffset();
-
---- a/src/quicktemplates2/qquickscrollbar.cpp
-+++ b/src/quicktemplates2/qquickscrollbar.cpp
-@@ -797,6 +797,14 @@ void QQuickScrollBarAttachedPrivate::initHorizontal()
- if (parent && parent == flickable->parentItem())
- horizontal->stackAfter(flickable);
-
-+ // If a scroll bar was previously hidden (due to e.g. setting a new contentItem
-+ // on a ScrollView), we need to make sure that we un-hide it.
-+ // We don't bother checking if the item is actually the old one, because
-+ // if it's not, all of the things the function does (setting parent, visibility, etc.)
-+ // should be no-ops anyway.
-+ if (auto control = qobject_cast<QQuickControl*>(q_ptr->parent()))
-+ QQuickControlPrivate::unhideOldItem(control, horizontal);
-+
- layoutHorizontal();
- horizontal->setSize(area->property("widthRatio").toReal());
- horizontal->setPosition(area->property("xPosition").toReal());
-@@ -818,6 +826,9 @@ void QQuickScrollBarAttachedPrivate::initVertical()
- if (parent && parent == flickable->parentItem())
- vertical->stackAfter(flickable);
-
-+ if (auto control = qobject_cast<QQuickControl*>(q_ptr->parent()))
-+ QQuickControlPrivate::unhideOldItem(control, vertical);
-+
- layoutVertical();
- vertical->setSize(area->property("heightRatio").toReal());
- vertical->setPosition(area->property("yPosition").toReal());
---- a/tests/auto/controls/data/tst_scrollview.qml
-+++ b/tests/auto/controls/data/tst_scrollview.qml
-@@ -576,4 +576,51 @@ TestCase {
- verify(newHorizontalScrollBar.visible)
- verify(!oldHorizontalScrollBar.visible)
- }
-+
-+ Component {
-+ id: bindingToContentItemAndStandaloneFlickable
-+
-+ Item {
-+ width: 200
-+ height: 200
-+
-+ property alias scrollView: scrollView
-+
-+ ScrollView {
-+ id: scrollView
-+ anchors.fill: parent
-+ contentItem: listView
-+
-+ property Item someBinding: contentItem
-+ }
-+ ListView {
-+ id: listView
-+ model: 10
-+ delegate: ItemDelegate {
-+ text: modelData
-+ width: listView.width
-+ }
-+ }
-+ }
-+ }
-+
-+ // Tests that scroll bars show up for a ScrollView where
-+ // - its contentItem is declared as a standalone, separate item
-+ // - there is a binding to contentItem (which causes a default Flickable to be created)
-+ function test_bindingToContentItemAndStandaloneFlickable() {
-+ let root = createTemporaryObject(bindingToContentItemAndStandaloneFlickable, testCase)
-+ verify(root)
-+
-+ let control = root.scrollView
-+ let verticalScrollBar = control.ScrollBar.vertical
-+ let horizontalScrollBar = control.ScrollBar.horizontal
-+ compare(verticalScrollBar.parent, control)
-+ compare(horizontalScrollBar.parent, control)
-+ verify(verticalScrollBar.visible)
-+ verify(horizontalScrollBar.visible)
-+
-+ mouseDrag(verticalScrollBar, verticalScrollBar.width / 2, verticalScrollBar.height / 2, 0, 50)
-+ verify(verticalScrollBar.active)
-+ verify(horizontalScrollBar.active)
-+ }
- }
diff --git a/debian/patches/series b/debian/patches/series
index dae04a5..e5709f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
0001-Unset-mouseGrabberPopup-if-it-s-removed-from-childre.patch
0002-Ensure-we-don-t-crash-when-changing-sizes-after-clea.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
disable_fontless_examples_build.patch
More information about the Neon-commits
mailing list