diff --git a/0001-Unset-mouseGrabberPopup-if-it-s-removed-from-childre.patch b/0001-Unset-mouseGrabberPopup-if-it-s-removed-from-childre.patch new file mode 100644 index 0000000..90ac415 --- /dev/null +++ b/0001-Unset-mouseGrabberPopup-if-it-s-removed-from-childre.patch @@ -0,0 +1,182 @@ +From e303a884f2d700ac0bc70c6147088a9b67becf20 Mon Sep 17 00:00:00 2001 +From: David Redondo +Date: Mon, 19 Jul 2021 10:06:17 +0200 +Subject: [PATCH 1/6] Unset mouseGrabberPopup if it's removed from children + +The mouseGrabberPopup is supposed to be unset in handleRelease, however +when the exit transition of the mouseGrabberPopup (that closed itself on +button press) finishes before the release event is delivered, it +unparents itself from the overlay (see +QQuickPopupPrivate::finalizeExitTransition) and the overlay sets itself +invisible if there is nothing else visible in it. Because the overlay +is not visible it handles no events anymore and the release is missed +and the grabber is never unset. When opening another non-modal popup +the overlay then will continue forwarding the events to now invisible +popup. +So when the overlay loses the currently grabbing popup as a child we need +to reset mouseGrabberPopup. + +Fixes: QTBUG-95259 +Change-Id: I3c832d47f3cee216b81ef1b5cb7dd77bf4149991 +Reviewed-by: Mitch Curtis +(adapted from commit d07ee1345acd8100fa5cbb7f05c0aaf5f87f4cae) + +(cherry picked from commit 1a59ef4218658ffc476909ef4fca13d6cf86d04b) +--- + src/quicktemplates2/qquickoverlay.cpp | 5 +- + .../data/releaseAfterExitTransition.qml | 78 +++++++++++++++++++ + tests/auto/qquickpopup/tst_qquickpopup.cpp | 29 +++++++ + 3 files changed, 111 insertions(+), 1 deletion(-) + create mode 100644 tests/auto/qquickpopup/data/releaseAfterExitTransition.qml + +diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp +index 91bd59184..0ce518f84 100644 +--- a/src/quicktemplates2/qquickoverlay.cpp ++++ b/src/quicktemplates2/qquickoverlay.cpp +@@ -399,8 +399,11 @@ void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data) + Q_D(QQuickOverlay); + QQuickItem::itemChange(change, data); + +- if (change == ItemChildAddedChange || change == ItemChildRemovedChange) ++ if (change == ItemChildAddedChange || change == ItemChildRemovedChange) { + setVisible(!d->allDrawers.isEmpty() || !childItems().isEmpty()); ++ if (data.item->parent() == d->mouseGrabberPopup) ++ d->setMouseGrabberPopup(nullptr); ++ } + } + + void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +diff --git a/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml b/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml +new file mode 100644 +index 000000000..9e4598b9f +--- /dev/null ++++ b/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml +@@ -0,0 +1,78 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2021 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.15 ++import QtQuick.Controls 2.15 ++ ++ApplicationWindow { ++ id: window ++ width: 400 ++ height: 400 ++ title: "releaseAfterExitTransition" ++ ++ property alias popup: popup ++ property alias modalPopup: modalPopup ++ ++ Popup { ++ id: popup ++ y: parent.height - height ++ width: 50 ++ height: 50 ++ } ++ ++ Popup { ++ id: modalPopup ++ modal: true ++ y: parent.height - height ++ width: 50 ++ height: 50 ++ exit: Transition { PauseAnimation { duration: 100 } } ++ } ++} +diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp +index 54952d128..3d50e2dd4 100644 +--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp ++++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp +@@ -100,6 +100,7 @@ private slots: + void invisibleToolTipOpen(); + void centerInOverlayWithinStackViewItem(); + void destroyDuringExitTransition(); ++ void releaseAfterExitTransition(); + }; + + void tst_QQuickPopup::initTestCase() +@@ -1575,6 +1576,34 @@ void tst_QQuickPopup::destroyDuringExitTransition() + QVERIFY(!button->isDown()); + } + ++void tst_QQuickPopup::releaseAfterExitTransition() ++{ ++ QQuickApplicationHelper helper(this, "releaseAfterExitTransition.qml"); ++ QVERIFY2(helper.ready, helper.failureMessage()); ++ ++ QQuickWindow *window = helper.window; ++ window->show(); ++ QVERIFY(QTest::qWaitForWindowActive(window)); ++ ++ QQuickOverlay *overlay = QQuickOverlay::overlay(window); ++ QQuickPopup *modalPopup = window->property("modalPopup").value(); ++ QQuickPopup *popup = window->property("popup").value(); ++ ++ modalPopup->open(); ++ QTRY_VERIFY(modalPopup->isOpened()); ++ ++ QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); ++ // wait until the transition is finished and the overlay hides itself ++ QTRY_VERIFY(!overlay->isVisible()); ++ QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); ++ ++ popup->open(); ++ QTRY_VERIFY(popup->isOpened()); ++ QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); ++ QTRY_VERIFY(!popup->isOpened()); ++} ++ ++ + QTEST_QUICKCONTROLS_MAIN(tst_QQuickPopup) + + #include "tst_qquickpopup.moc" +-- +2.40.1 + diff --git a/0002-Ensure-we-don-t-crash-when-changing-sizes-after-clea.patch b/0002-Ensure-we-don-t-crash-when-changing-sizes-after-clea.patch new file mode 100644 index 0000000..17dcb88 --- /dev/null +++ b/0002-Ensure-we-don-t-crash-when-changing-sizes-after-clea.patch @@ -0,0 +1,83 @@ +From a50d27c87d7f8c9e710933b2f808ea132205d9e6 Mon Sep 17 00:00:00 2001 +From: Aleix Pol +Date: Tue, 4 Jan 2022 16:34:16 +0100 +Subject: [PATCH 2/6] Ensure we don't crash when changing sizes after cleanup + +This addresses the problems I've seen during destruction. Only +encountered it when using complex layouts on a DialogButtonBox. + +Pick-to: 6.2 6.3 +Change-Id: I54528c8a2b57b4798d90f7e2021e3127f8404762 +(cherry picked from commit 8b24d2bf1655e8491bdd74013579e09cd009e8fc in +qtdeclarative) +--- + src/quicktemplates2/qquickcontainer.cpp | 5 +++-- + src/quicktemplates2/qquickdialogbuttonbox.cpp | 8 +++++++- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp +index f38c2b09c..6eed2a024 100644 +--- a/src/quicktemplates2/qquickcontainer.cpp ++++ b/src/quicktemplates2/qquickcontainer.cpp +@@ -225,6 +225,7 @@ void QQuickContainerPrivate::cleanup() + QObject::disconnect(contentModel, &QQmlObjectModel::countChanged, q, &QQuickContainer::countChanged); + QObject::disconnect(contentModel, &QQmlObjectModel::childrenChanged, q, &QQuickContainer::contentChildrenChanged); + delete contentModel; ++ contentModel = nullptr; + } + + QQuickItem *QQuickContainerPrivate::itemAt(int index) const +@@ -436,7 +437,7 @@ void QQuickContainerPrivate::contentChildren_clear(QQmlListProperty + void QQuickContainerPrivate::updateContentWidth() + { + Q_Q(QQuickContainer); +- if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth)) ++ if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth) || !contentModel) + return; + + contentWidth = implicitContentWidth; +@@ -446,7 +447,7 @@ void QQuickContainerPrivate::updateContentWidth() + void QQuickContainerPrivate::updateContentHeight() + { + Q_Q(QQuickContainer); +- if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight)) ++ if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight) || !contentModel) + return; + + contentHeight = implicitContentHeight; +diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp +index e6db14eb5..6197d1547 100644 +--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp ++++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp +@@ -237,7 +237,7 @@ static QRectF alignedRect(Qt::LayoutDirection direction, Qt::Alignment alignment + void QQuickDialogButtonBoxPrivate::resizeContent() + { + Q_Q(QQuickDialogButtonBox); +- if (!contentItem) ++ if (!contentItem || !contentModel) + return; + + QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding()); +@@ -322,6 +322,9 @@ void QQuickDialogButtonBoxPrivate::updateLayout() + qreal QQuickDialogButtonBoxPrivate::getContentWidth() const + { + Q_Q(const QQuickDialogButtonBox); ++ if (!contentModel) ++ return 0; ++ + const int count = contentModel->count(); + const qreal totalSpacing = qMax(0, count - 1) * spacing; + qreal totalWidth = totalSpacing; +@@ -341,6 +344,9 @@ qreal QQuickDialogButtonBoxPrivate::getContentWidth() const + qreal QQuickDialogButtonBoxPrivate::getContentHeight() const + { + Q_Q(const QQuickDialogButtonBox); ++ if (!contentModel) ++ return 0; ++ + const int count = contentModel->count(); + qreal maxHeight = 0; + for (int i = 0; i < count; ++i) { +-- +2.40.1 + diff --git a/0003-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch b/0003-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch new file mode 100644 index 0000000..b037309 --- /dev/null +++ b/0003-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch @@ -0,0 +1,179 @@ +From 2b02c893df78e4b435d56432193e8301fa535d80 Mon Sep 17 00:00:00 2001 +From: Mitch Curtis +Date: Mon, 18 Jul 2022 15:21:49 +0800 +Subject: [PATCH 3/6] 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 +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(+) + +diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp +index 409fb582c..da95086e4 100644 +--- 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); +diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h +index 8e979079e..a6e624c91 100644 +--- 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(); + +diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp +index 4e2f509db..1c4b308cd 100644 +--- 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(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(q_ptr->parent())) ++ QQuickControlPrivate::unhideOldItem(control, vertical); ++ + layoutVertical(); + vertical->setSize(area->property("heightRatio").toReal()); + vertical->setPosition(area->property("yPosition").toReal()); +diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml +index 0e8b08352..cd4931184 100644 +--- 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) ++ } + } +-- +2.40.1 + diff --git a/0004-implement-a11y-pressing-of-qquickabstractbutton.patch b/0004-implement-a11y-pressing-of-qquickabstractbutton.patch new file mode 100644 index 0000000..9edc7c6 --- /dev/null +++ b/0004-implement-a11y-pressing-of-qquickabstractbutton.patch @@ -0,0 +1,55 @@ +From 9dfd8a5d7cae515cd05953c788fcec38e16ba2f5 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Wed, 2 Nov 2022 12:39:11 +0100 +Subject: [PATCH 4/6] implement a11y pressing of qquickabstractbutton +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +this adds a pressAction default implementation that simply calls trigger +(which in turn either triggers the action or emits a click), allowing +accessibility tools to issue a button press via a11y api. + +Change-Id: I75b4fb8680835093b1135fdbf4329aaa85dc3243 +Reviewed-by: Arjen Hiemstra +Reviewed-by: Aleix Pol Gonzalez +Reviewed-by: Jan Arve Sæther +(cherry picked from commit 705659eaaf47af72eeb5f5c742e18a5c665a76eb in +qtdeclarative) +--- + src/quicktemplates2/qquickabstractbutton.cpp | 6 ++++++ + src/quicktemplates2/qquickabstractbutton_p.h | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp +index 20cf59c1a..43af47a94 100644 +--- a/src/quicktemplates2/qquickabstractbutton.cpp ++++ b/src/quicktemplates2/qquickabstractbutton.cpp +@@ -1201,6 +1201,12 @@ QAccessible::Role QQuickAbstractButton::accessibleRole() const + } + return QAccessible::Button; + } ++ ++void QQuickAbstractButton::accessiblePressAction() ++{ ++ Q_D(QQuickAbstractButton); ++ d->trigger(); ++} + #endif + + QT_END_NAMESPACE +diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h +index 0fa48980e..ab66220d0 100644 +--- a/src/quicktemplates2/qquickabstractbutton_p.h ++++ b/src/quicktemplates2/qquickabstractbutton_p.h +@@ -209,6 +209,7 @@ protected: + #if QT_CONFIG(accessibility) + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; ++ Q_INVOKABLE void accessiblePressAction(); + #endif + + private: +-- +2.40.1 + diff --git a/0005-Fix-the-popup-position-of-a-Menu.patch b/0005-Fix-the-popup-position-of-a-Menu.patch new file mode 100644 index 0000000..cf4dd22 --- /dev/null +++ b/0005-Fix-the-popup-position-of-a-Menu.patch @@ -0,0 +1,45 @@ +From 7baa0cba0b92e7e04825405280ca195dd312dd50 Mon Sep 17 00:00:00 2001 +From: Inho Lee +Date: Mon, 22 Aug 2022 21:05:00 +0800 +Subject: [PATCH 5/6] Fix the popup position of a Menu +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +QPA code should operate in native coord. +Treat QWidgetPlatformMenu::showPopup's input as native coord. + +Fixes: QTBUG-94619 +Fixes: QTBUG-94783 +Change-Id: Iaa030c96d84e4a588e625fe191e4324f70be961f +Reviewed-by: Morten Johan Sørvig +(cherry picked from commit f8cf17166c9af147f0b8fea72f5b4a8a6098a5d7 in +qtdeclarative) +--- + src/imports/platform/widgets/qwidgetplatformmenu.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/imports/platform/widgets/qwidgetplatformmenu.cpp b/src/imports/platform/widgets/qwidgetplatformmenu.cpp +index e5fe734f7..e36922775 100644 +--- a/src/imports/platform/widgets/qwidgetplatformmenu.cpp ++++ b/src/imports/platform/widgets/qwidgetplatformmenu.cpp +@@ -38,6 +38,7 @@ + #include "qwidgetplatformmenuitem_p.h" + + #include ++#include + #include + #include + +@@ -145,7 +146,7 @@ void QWidgetPlatformMenu::showPopup(const QWindow *window, const QRect &targetRe + + QPoint targetPos = targetRect.bottomLeft(); + if (window) +- targetPos = window->mapToGlobal(targetPos); ++ targetPos = window->mapToGlobal(QHighDpi::fromNativeLocalPosition(targetPos, window)); + + const QWidgetPlatformMenuItem *widgetItem = qobject_cast(item); + m_menu->popup(targetPos, widgetItem ? widgetItem->action() : nullptr); +-- +2.40.1 + diff --git a/0006-Accessibility-respect-value-in-attached-Accessible-i.patch b/0006-Accessibility-respect-value-in-attached-Accessible-i.patch new file mode 100644 index 0000000..07e7073 --- /dev/null +++ b/0006-Accessibility-respect-value-in-attached-Accessible-i.patch @@ -0,0 +1,167 @@ +From 0472a07a8f39587052216d85a7ed235c531eba2c Mon Sep 17 00:00:00 2001 +From: Volker Hilsheimer +Date: Tue, 18 Apr 2023 22:05:36 +0200 +Subject: [PATCH 6/6] 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/quicktemplates2/qquickcontrol.cpp | 3 ++- + src/quicktemplates2/qquicklabel.cpp | 2 +- + src/quicktemplates2/qquickpopup.cpp | 14 ++++++++++++++ + src/quicktemplates2/qquickpopup_p.h | 3 +++ + src/quicktemplates2/qquickpopupitem.cpp | 2 +- + src/quicktemplates2/qquicktextarea.cpp | 2 +- + src/quicktemplates2/qquicktextfield.cpp | 2 +- + 7 files changed, 23 insertions(+), 5 deletions(-) + +diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp +index da95086e4..c4b05c13c 100644 +--- a/src/quicktemplates2/qquickcontrol.cpp ++++ b/src/quicktemplates2/qquickcontrol.cpp +@@ -2327,12 +2327,13 @@ QAccessible::Role QQuickControl::accessibleRole() const + + void QQuickControl::accessibilityActiveChanged(bool active) + { ++ Q_D(QQuickControl); + if (!active) + return; + + QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(this, true)); + Q_ASSERT(accessibleAttached); +- accessibleAttached->setRole(accessibleRole()); ++ accessibleAttached->setRole(d->effectiveAccessibleRole()); + } + #endif + +diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp +index 71b60a2bc..2bc621674 100644 +--- a/src/quicktemplates2/qquicklabel.cpp ++++ b/src/quicktemplates2/qquicklabel.cpp +@@ -263,7 +263,7 @@ void QQuickLabelPrivate::accessibilityActiveChanged(bool active) + Q_Q(QQuickLabel); + QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); + Q_ASSERT(accessibleAttached); +- accessibleAttached->setRole(accessibleRole()); ++ accessibleAttached->setRole(effectiveAccessibleRole()); + maybeSetAccessibleName(text); + } + +diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp +index 7df80a047..bfaa84e30 100644 +--- a/src/quicktemplates2/qquickpopup.cpp ++++ b/src/quicktemplates2/qquickpopup.cpp +@@ -46,6 +46,7 @@ + + #include + #include ++#include + #include + #include + +@@ -2720,6 +2721,19 @@ QPalette QQuickPopup::defaultPalette() const + } + + #if QT_CONFIG(accessibility) ++QAccessible::Role QQuickPopup::effectiveAccessibleRole() const ++{ ++ auto *attached = qmlAttachedPropertiesObject(this, false); ++ ++ auto role = QAccessible::NoRole; ++ if (auto *accessibleAttached = qobject_cast(attached)) ++ role = accessibleAttached->role(); ++ if (role == QAccessible::NoRole) ++ role = accessibleRole(); ++ ++ return role; ++} ++ + QAccessible::Role QQuickPopup::accessibleRole() const + { + return QAccessible::Dialog; +diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h +index dc3ebf6f8..a3773be3e 100644 +--- a/src/quicktemplates2/qquickpopup_p.h ++++ b/src/quicktemplates2/qquickpopup_p.h +@@ -454,7 +454,10 @@ protected: + virtual QPalette defaultPalette() const; + + #if QT_CONFIG(accessibility) ++ QAccessible::Role effectiveAccessibleRole() const; ++private: + virtual QAccessible::Role accessibleRole() const; ++protected: + virtual void accessibilityActiveChanged(bool active); + #endif + +diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp +index 0069b9fc1..143c37fc3 100644 +--- a/src/quicktemplates2/qquickpopupitem.cpp ++++ b/src/quicktemplates2/qquickpopupitem.cpp +@@ -404,7 +404,7 @@ QPalette QQuickPopupItem::defaultPalette() const + QAccessible::Role QQuickPopupItem::accessibleRole() const + { + Q_D(const QQuickPopupItem); +- return d->popup->accessibleRole(); ++ return d->popup->effectiveAccessibleRole(); + } + + void QQuickPopupItem::accessibilityActiveChanged(bool active) +diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp +index 64fc631dd..fba3f6b70 100644 +--- a/src/quicktemplates2/qquicktextarea.cpp ++++ b/src/quicktemplates2/qquicktextarea.cpp +@@ -512,7 +512,7 @@ void QQuickTextAreaPrivate::accessibilityActiveChanged(bool active) + Q_Q(QQuickTextArea); + QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); + Q_ASSERT(accessibleAttached); +- accessibleAttached->setRole(accessibleRole()); ++ accessibleAttached->setRole(effectiveAccessibleRole()); + accessibleAttached->set_readOnly(q->isReadOnly()); + accessibleAttached->setDescription(placeholder); + } +diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp +index 8fa04bd3a..e83346cbd 100644 +--- a/src/quicktemplates2/qquicktextfield.cpp ++++ b/src/quicktemplates2/qquicktextfield.cpp +@@ -359,7 +359,7 @@ void QQuickTextFieldPrivate::accessibilityActiveChanged(bool active) + Q_Q(QQuickTextField); + QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); + Q_ASSERT(accessibleAttached); +- accessibleAttached->setRole(accessibleRole()); ++ accessibleAttached->setRole(effectiveAccessibleRole()); + accessibleAttached->set_readOnly(m_readOnly); + accessibleAttached->set_passwordEdit((m_echoMode == QQuickTextField::Password || m_echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false); + accessibleAttached->setDescription(placeholder); +-- +2.40.1 + diff --git a/qt5-qtquickcontrols2.spec b/qt5-qtquickcontrols2.spec index b830272..8ea8f7b 100644 --- a/qt5-qtquickcontrols2.spec +++ b/qt5-qtquickcontrols2.spec @@ -1,11 +1,20 @@ +%global qt_module qtquickcontrols2 + Name: qt5-qtquickcontrols2 -Summary: Qt5 - module for embedded QtQuick control set -Version: 5.15.2 -Release: 2 -License: GPL-3.0-only AND LGPL-3.0-only AND GPL-2.0-or-later AND GFDL-1.3-only +Summary: Qt5 - module with set of QtQuick controls for embedded +Version: 5.15.10 +Release: 1 +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qtquickcontrols2-everywhere-src-%{version}.tar.xz +Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz +Patch1: 0001-Unset-mouseGrabberPopup-if-it-s-removed-from-childre.patch +Patch2: 0002-Ensure-we-don-t-crash-when-changing-sizes-after-clea.patch +Patch3: 0003-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch +Patch4: 0004-implement-a11y-pressing-of-qquickabstractbutton.patch +Patch5: 0005-Fix-the-popup-position-of-a-Menu.patch +Patch6: 0006-Accessibility-respect-value-in-attached-Accessible-i.patch + BuildRequires: make BuildRequires: qt5-qtbase-devel >= %{version} qt5-qtbase-private-devel qt5-qtdeclarative-devel Requires: qt5-qtdeclarative >= %{version} qt5-qtgraphicaleffects >= %{version} @@ -14,17 +23,26 @@ Requires: qt5-qtdeclarative >= %{version} qt5-qtgraphicaleffects >= %{vers %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ %description -This package provides a set of controls for building a complete interface in Qt Quick. -These controls are the first choice for hardware with limited resources as it is -optimized for embedded systems. +The Qt Labs Controls module provides a set of controls that can be used to +build complete interfaces in Qt Quick. + +Unlike Qt Quick Controls, these controls are optimized for embedded systems +and so are preferred for hardware with limited resources. %package devel -Summary: Development and Examples files for %{name} -Requires: %{name} = %{version}-%{release} qt5-qtbase-devel qt5-qtdeclarative-devel -Provides: %{name}-examples = %{version}-%{release} -Obsoletes: %{name}-examples < %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +Requires: qt5-qtdeclarative-devel%{?_isa} %description devel -This package provides module for embedded QtQuick control set +%{summary}. + +%package examples +Summary: Examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. + %prep %autosetup -n qtquickcontrols2-everywhere-src-%{version} -p1 @@ -58,23 +76,31 @@ cd - %files %license LICENSE.LGPLv3 LICENSE.GPLv3 -%{_qt5_libdir}/libQt5Quick*.so.5* -%{_qt5_qmldir}/Qt/labs/* -%{_qt5_archdatadir}/qml/QtQuick/*.2/ +%{_qt5_libdir}/libQt5QuickTemplates2.so.5* +%{_qt5_libdir}/libQt5QuickControls2.so.5* +%{_qt5_qmldir}/Qt/labs/calendar +%{_qt5_qmldir}/Qt/labs/platform +%{_qt5_archdatadir}/qml/QtQuick/Controls.2/ +%{_qt5_archdatadir}/qml/QtQuick/Templates.2/ +%files examples +%{_qt5_examplesdir}/quickcontrols2/ %files devel -%{_qt5_examplesdir}/quickcontrols2/ %{_qt5_headerdir}/ %{_qt5_libdir}/pkgconfig/*.pc -%{_qt5_libdir}/libQt5Quick*2.so -%{_qt5_libdir}/libQt5Quick*2.prl +%{_qt5_libdir}/libQt5QuickTemplates2.so +%{_qt5_libdir}/libQt5QuickControls2.so +%{_qt5_libdir}/libQt5QuickTemplates2.prl +%{_qt5_libdir}/libQt5QuickControls2.prl %{_qt5_libdir}/qt5/mkspecs/modules/* %{_libdir}/cmake/Qt5QuickControls2/ %{_libdir}/cmake/Qt5QuickTemplates2/ - %changelog +* Tue Aug 22 2023 peijiankang - 5.15.10-1 +- update to upstream version 5.15.10 + * Tue May 10 2022 Ge Wang - 5.15.2-2 - License compliance rectification diff --git a/qtquickcontrols2-everywhere-src-5.15.2.tar.xz b/qtquickcontrols2-everywhere-opensource-src-5.15.10.tar.xz similarity index 54% rename from qtquickcontrols2-everywhere-src-5.15.2.tar.xz rename to qtquickcontrols2-everywhere-opensource-src-5.15.10.tar.xz index a4704bc..c3cf4fc 100644 Binary files a/qtquickcontrols2-everywhere-src-5.15.2.tar.xz and b/qtquickcontrols2-everywhere-opensource-src-5.15.10.tar.xz differ