6.7.1

Resolves: RHEL-36430

.gitignore

@@ -25,3 +25,4 @@
 /qtdeclarative-everywhere-src-6.6.0.tar.xz
 /qtdeclarative-everywhere-src-6.6.1.tar.xz
 /qtdeclarative-everywhere-src-6.7.0.tar.xz
+/qtdeclarative-everywhere-src-6.7.1.tar.xz

qquickselectiontriangle-fix-crash-when-target-is-null.patch

@@ -1,23 +0,0 @@
-From ab88fcd990523070f2c018f4599b9bfa023d3b95 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@kde.org>
-Date: Fri, 01 Mar 2024 22:44:05 +0100
-Subject: [PATCH] QQuickSelectionRectangle: Fix crash when target is null
-
-Pick-to: 6.7 6.6
-Change-Id: I9eb92583f2cfe1a0a6bee54e3e3f31528c3b6993
-Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
----
-
-diff --git a/src/quicktemplates/qquickselectionrectangle.cpp b/src/quicktemplates/qquickselectionrectangle.cpp
-index f4543f0..7ef9996 100644
---- a/src/quicktemplates/qquickselectionrectangle.cpp
-+++ b/src/quicktemplates/qquickselectionrectangle.cpp
-@@ -491,7 +491,7 @@
-     m_tapHandler->setEnabled(enabled);
- 
-     if (m_selectionMode == QQuickSelectionRectangle::Auto) {
--        if (qobject_cast<QQuickScrollView *>(m_target->parentItem())) {
-+        if (m_target && qobject_cast<QQuickScrollView *>(m_target->parentItem())) {
-             // ScrollView allows flicking with touch, but not with mouse. So we do
-             // the same here: you can drag to select with a mouse, but not with touch.
-             m_effectiveSelectionMode = QQuickSelectionRectangle::Drag;

qquicktextedit-check-qquickaccessibleattached-for-nullptr.patch

@@ -1,35 +0,0 @@
-From 121fcc597d7d756737613570ac05a09911cec265 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@qt.io>
-Date: Tue, 26 Mar 2024 12:09:23 +0100
-Subject: [PATCH] QQuickTextEdit: Check QQuickAccessibleAttached for nullptr
-
-If the host object is in the process of being deleted, the attached
-object will be null. We cannot rule this out here, and crashes have been
-reported.
-
-Amends commmit 12517742fcbd40b2311b94abe840532eae3d8914
-
-Pick-to: 6.7
-Change-Id: I31fcab2999c8ab8c20f3a2cd58060cbbefa7de40
----
-
-diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
-index 006d235..66615d9 100644
---- a/src/quick/items/qquicktextedit.cpp
-+++ b/src/quick/items/qquicktextedit.cpp
-@@ -1015,10 +1015,11 @@
-         return;
- 
-     Q_Q(QQuickTextEdit);
--    QQuickAccessibleAttached *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, true));
--    Q_ASSERT(accessibleAttached);
--    accessibleAttached->setRole(effectiveAccessibleRole());
--    accessibleAttached->set_readOnly(q->isReadOnly());
-+    if (QQuickAccessibleAttached *accessibleAttached = qobject_cast<QQuickAccessibleAttached *>(
-+                qmlAttachedPropertiesObject<QQuickAccessibleAttached>(q, true))) {
-+        accessibleAttached->setRole(effectiveAccessibleRole());
-+        accessibleAttached->set_readOnly(q->isReadOnly());
-+    }
- }
- 
- QAccessible::Role QQuickTextEditPrivate::accessibleRole() const

qt6-qtdeclarative.spec

@@ -16,7 +16,7 @@
 
 Summary: Qt6 - QtDeclarative component
 Name:    qt6-%{qt_module}
-Version: 6.7.0
+Version: 6.7.1
 Release: 1%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -35,8 +35,6 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
 Source5: qv4global_p-multilib.h
 
 ## upstream patches
-Patch0:  qquickselectiontriangle-fix-crash-when-target-is-null.patch
-Patch1:  qquicktextedit-check-qquickaccessibleattached-for-nullptr.patch
 
 ## upstreamable patches
 
@@ -294,7 +292,7 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6Quick*.so
 %{_qt6_libdir}/libQt6QmlXmlListModel.so
 %{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
-%{_qt6_libdir}/qt6/objects-RelWithDebInfo/QmlTypeRegistrarPrivate_resources_1/.rcc/qrc_jsRootMetaTypes_init.cpp.o
+%{_qt6_libdir}/qt6/objects-RelWithDebInfo/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o
 %{_qt6_archdatadir}/mkspecs/modules/*.pri
 %{_qt6_archdatadir}/mkspecs/features/*.prf
 %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtDeclarativeTestsConfig.cmake
@@ -398,6 +396,10 @@ make check -k -C tests ||:
 %endif
 
 %changelog
+* Fri May 31 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
+- 6.7.1
+  Resolves: RHEL-36430
+
 * Thu Apr 18 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
 - 6.7.0
   Resolves: RHEL-27845

sources

@@ -1 +1 @@
-SHA512 (qtdeclarative-everywhere-src-6.7.0.tar.xz) = b189f3fc4ae9ad3e5c26aa56696b97cb2f1894cb23110928a31e5a62fb779578b492bec2f4dda5b31958a33eb2571ec4e1085ae6864442507be3ae0da83c96ee
+SHA512 (qtdeclarative-everywhere-src-6.7.1.tar.xz) = 77cdd31f2efa6e677755477b14c7770afa51b81cc7626ef21ebccf52ce69173a73b03851b0b491766f816e0cc946e6f238f8c7c70ad121d56428fe513e50a4d0