diff --git a/desktop/toolkit/qt5/qt5-quickcontrols2/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-quickcontrols2/files/qt_kde.patch index 4fd8da8d2a..0aaecbc833 100644 --- a/desktop/toolkit/qt5/qt5-quickcontrols2/files/qt_kde.patch +++ b/desktop/toolkit/qt5/qt5-quickcontrols2/files/qt_kde.patch @@ -79,54 +79,10 @@ index f38c2b09c..6eed2a024 100644 contentHeight = implicitContentHeight; diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp -index 409fb582c..c4b05c13c 100644 +index a719efd34..768691dac 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); -@@ -2297,12 +2327,13 @@ QAccessible::Role QQuickControl::accessibleRole() const +@@ -2334,12 +2334,13 @@ QAccessible::Role QQuickControl::accessibleRole() const void QQuickControl::accessibilityActiveChanged(bool active) { @@ -141,18 +97,6 @@ index 409fb582c..c4b05c13c 100644 } #endif -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/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index e6db14eb5..6197d1547 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -276,35 +220,6 @@ index 0069b9fc1..143c37fc3 100644 } void QQuickPopupItem::accessibilityActiveChanged(bool active) -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/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 64fc631dd..fba3f6b70 100644 --- a/src/quicktemplates2/qquicktextarea.cpp @@ -331,62 +246,6 @@ index 8fa04bd3a..e83346cbd 100644 accessibleAttached->set_readOnly(m_readOnly); accessibleAttached->set_passwordEdit((m_echoMode == QQuickTextField::Password || m_echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false); accessibleAttached->setDescription(placeholder); -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) -+ } - } diff --git a/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml b/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml new file mode 100644 index 000000000..9e4598b9f diff --git a/desktop/toolkit/qt5/qt5-quickcontrols2/pspec.xml b/desktop/toolkit/qt5/qt5-quickcontrols2/pspec.xml index 43c2559124..2894b7c8d9 100755 --- a/desktop/toolkit/qt5/qt5-quickcontrols2/pspec.xml +++ b/desktop/toolkit/qt5/qt5-quickcontrols2/pspec.xml @@ -11,14 +11,14 @@ Next generation user interface controls based on Qt Quick Next generation user interface controls based on Qt Quick LGPLv2.1-linking-exception - https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.10.tar.xz + https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.11.tar.xz - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-graphicaleffects - qt5-xmlpatterns-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-graphicaleffects + qt5-xmlpatterns-devel + qt5-declarative-devel qt_kde.patch @@ -29,9 +29,9 @@ qt5-quickcontrols2 libgcc - qt5-base - qt5-declarative - qt5-graphicaleffects + qt5-base + qt5-declarative + qt5-graphicaleffects /usr/lib @@ -44,8 +44,8 @@ qt5-quickcontrols2-devel qt5-quickcontrols2 - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel /usr/include @@ -56,7 +56,7 @@ qt5-quickcontrols2-docs - qt5-base + qt5-base /usr/share/doc @@ -64,6 +64,13 @@ + + 2023-10-07 + 5.15.11 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-06-17 5.15.10 diff --git a/desktop/toolkit/qt5/qt5-serialbus/pspec.xml b/desktop/toolkit/qt5/qt5-serialbus/pspec.xml index c95e5aa0d4..39d5384a3f 100755 --- a/desktop/toolkit/qt5/qt5-serialbus/pspec.xml +++ b/desktop/toolkit/qt5/qt5-serialbus/pspec.xml @@ -14,18 +14,18 @@ LGPL3 Qt module for general purpose serial bus access Qt module for general purpose serial bus access - http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtserialbus-everywhere-opensource-src-5.15.10.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtserialbus-everywhere-opensource-src-5.15.11.tar.xz - qt5-base-devel - qt5-serialport-devel + qt5-base-devel + qt5-serialport-devel qt5-serialbus Qt module for general purpose serial bus access - qt5-base - qt5-serialport + qt5-base + qt5-serialport libgcc @@ -40,7 +40,7 @@ qt5-serialbus-devel Development files for qt5-serialbus - qt5-base-devel + qt5-base-devel qt5-serialbus @@ -51,6 +51,13 @@ + + 2023-10-07 + 5.15.11 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-06-17 5.15.10 diff --git a/desktop/toolkit/qt5/qt5-virtualkeyboard/pspec.xml b/desktop/toolkit/qt5/qt5-virtualkeyboard/pspec.xml index ab27bd686b..bd6edd2b09 100755 --- a/desktop/toolkit/qt5/qt5-virtualkeyboard/pspec.xml +++ b/desktop/toolkit/qt5/qt5-virtualkeyboard/pspec.xml @@ -11,22 +11,22 @@ GPL3 Qt module for general purpose serial bus access Virtual keyboard framework - http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.10.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.11.tar.xz libxcb-devel hunspell-devel - qt5-svg-devel - qt5-base-devel - qt5-declarative-devel + qt5-svg-devel + qt5-base-devel + qt5-declarative-devel qt5-virtualkeyboard Virtual keyboard framework - qt5-svg - qt5-base - qt5-declarative + qt5-svg + qt5-base + qt5-declarative libgcc libxcb hunspell @@ -51,6 +51,13 @@ + + 2023-10-07 + 5.15.11 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-06-17 5.15.10