public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jan Grulich <jgrulich@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/qt6-qtdeclarative] f44: 6.11.2
Date: Mon, 24 Aug 2026 06:15:59 GMT	[thread overview]
Message-ID: <178755215922.1.3041286364618720088.rpms-qt6-qtdeclarative-e382c583192e@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/qt6-qtdeclarative
Branch : f44
Commit : e382c583192ecee99a8c836981d3e1a1d0f114e5
Author : Jan Grulich <jgrulich@redhat.com>
Date   : 2026-08-24T08:15:11+02:00
Stats  : +14/-262 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/qt6-qtdeclarative/c/e382c583192ecee99a8c836981d3e1a1d0f114e5?branch=f44

Log:
6.11.2

---
diff --git a/.gitignore b/.gitignore
index cb299ae..8014ceb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@
 /qtdeclarative-everywhere-src-6.10.3.tar.xz
 /qtdeclarative-everywhere-src-6.11.0.tar.xz
 /qtdeclarative-everywhere-src-6.11.1.tar.xz
+/qtdeclarative-everywhere-src-6.11.2.tar.xz

diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index b64b832..e2c9768 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -15,8 +15,8 @@
 
 Summary: Qt6 - QtDeclarative component
 Name:    qt6-%{qt_module}
-Version: 6.11.1
-Release: 4%{?dist}
+Version: 6.11.2
+Release: 1%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://www.qt.io
@@ -34,9 +34,6 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
 Source5: qv4global_p-multilib.h
 
 ## upstream patches
-Patch0:  qtdeclarative-dialogs-use-generic-qtquickcontrols-import-in-base-fallback-dialogs.patch
-Patch1:  qtdeclarative-qmltableinstancemodel-refactor-qmodelindex-calculation-out-of-qquicktableview.patch
-Patch2:  qtdeclarative-a11y-guard-against-nullptr-for-scrollbar-valueinterface.patch
 
 ## upstreamable patches
 
@@ -683,6 +680,7 @@ make check -k -C tests ||:
 %dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QmlLSPrivate
+%dir %{_qt6_libdir}/cmake/Qt6QmltcPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QmlToolingSettingsPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QmlTypeRegistrarPrivate
 %dir %{_qt6_libdir}/cmake/Qt6QuickControlsTestUtilsPrivate
@@ -691,6 +689,7 @@ make check -k -C tests ||:
 %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlLSPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmltcPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QmlToolingSettingsPrivate/*cmake
 %{_qt6_libdir}/cmake/Qt6QmlTypeRegistrarPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6QuickControlsTestUtilsPrivate/*.cmake
@@ -699,6 +698,7 @@ make check -k -C tests ||:
 %{_qt6_headerdir}/QtQmlDebug/
 %{_qt6_headerdir}/QtQmlDom/
 %{_qt6_headerdir}/QtQmlLS/
+%{_qt6_headerdir}/QtQmltc/
 %{_qt6_headerdir}/QtQmlToolingSettings/
 %{_qt6_headerdir}/QtQmlTypeRegistrar/
 %{_qt6_headerdir}/QtQuickControlsTestUtils/
@@ -713,6 +713,8 @@ make check -k -C tests ||:
 %{_qt6_libdir}/libQt6QmlFormat.prl
 %{_qt6_libdir}/libQt6QmlLS.a
 %{_qt6_libdir}/libQt6QmlLS.prl
+%{_qt6_libdir}/libQt6Qmltc.a
+%{_qt6_libdir}/libQt6Qmltc.prl
 %{_qt6_libdir}/libQt6QmlToolingSettings.a
 %{_qt6_libdir}/libQt6QmlToolingSettings.prl
 %{_qt6_libdir}/libQt6QmlTypeRegistrar.a
@@ -725,6 +727,7 @@ make check -k -C tests ||:
 %{_qt6_descriptionsdir}/QmlDebugPrivate.json
 %{_qt6_descriptionsdir}/QmlDomPrivate.json
 %{_qt6_descriptionsdir}/QmlLSPrivate.json
+%{_qt6_descriptionsdir}/QmltcPrivate.json
 %{_qt6_descriptionsdir}/QmlToolingSettingsPrivate.json
 %{_qt6_descriptionsdir}/QmlTypeRegistrarPrivate.json
 %{_qt6_descriptionsdir}/QuickControlsTestUtilsPrivate.json
@@ -733,6 +736,7 @@ make check -k -C tests ||:
 %{_qt6_metatypesdir}/qt6qmldebugprivate_metatypes.json
 %{_qt6_metatypesdir}/qt6qmldomprivate_metatypes.json
 %{_qt6_metatypesdir}/qt6qmllsprivate_metatypes.json
+%{_qt6_metatypesdir}/qt6qmltcprivate_metatypes.json
 %{_qt6_metatypesdir}/qt6qmltoolingsettingsprivate_metatypes.json
 %{_qt6_metatypesdir}/qt6qmltyperegistrarprivate_metatypes.json
 %{_qt6_metatypesdir}/qt6quickcontrolstestutilsprivate_metatypes.json
@@ -755,6 +759,9 @@ make check -k -C tests ||:
 %endif
 
 %changelog
+* Fri Aug 21 2026 Jan Grulich <jgrulich@redhat.com> - 6.11.2-1
+- 6.11.2
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.11.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/qtdeclarative-a11y-guard-against-nullptr-for-scrollbar-valueinterface.patch b/qtdeclarative-a11y-guard-against-nullptr-for-scrollbar-valueinterface.patch
deleted file mode 100644
index aac99c8..0000000
--- a/qtdeclarative-a11y-guard-against-nullptr-for-scrollbar-valueinterface.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0093e85bbff86a25f3ab069de8ac19b3d723f706 Mon Sep 17 00:00:00 2001
-From: Magnus Groß <magnus@mggross.com>
-Date: Sat, 30 May 2026 21:26:03 +0200
-Subject: [PATCH] a11y: Guard against nullptr for scrollbar valueInterface
-
-The regression was introduced in 3e233634d83, which mistakenly assumed
-that valueInterface cannot be nullptr.
-
-Fixes: QTBUG-146959
-Pick-to: 6.11
-Change-Id: Ia47a05c9da6bf3889b12475f737aeab20485fe59
-Reviewed-by: MohammadHossein Qanbari <mohammad.qanbari@qt.io>
----
-
-diff --git a/src/quicktemplates/qquickscrollbar.cpp b/src/quicktemplates/qquickscrollbar.cpp
-index f7d0600..70c3b69 100644
---- a/src/quicktemplates/qquickscrollbar.cpp
-+++ b/src/quicktemplates/qquickscrollbar.cpp
-@@ -474,10 +474,10 @@
- #if QT_CONFIG(accessibility)
-     if (QAccessible::isActive()) {
-         if (QAccessibleInterface *accessible = QAccessible::queryAccessibleInterface(q)) {
--            QAccessibleValueInterface *valueInterface = accessible->valueInterface();
--            Q_ASSERT(valueInterface);
--            QAccessibleValueChangeEvent event(q, valueInterface->currentValue());
--            QAccessible::updateAccessibility(&event);
-+            if (QAccessibleValueInterface *valueInterface = accessible->valueInterface()) {
-+                QAccessibleValueChangeEvent event(q, valueInterface->currentValue());
-+                QAccessible::updateAccessibility(&event);
-+            }
-         }
-     }
- #endif

diff --git a/qtdeclarative-dialogs-use-generic-qtquickcontrols-import-in-base-fallback-dialogs.patch b/qtdeclarative-dialogs-use-generic-qtquickcontrols-import-in-base-fallback-dialogs.patch
deleted file mode 100644
index 91902e1..0000000
--- a/qtdeclarative-dialogs-use-generic-qtquickcontrols-import-in-base-fallback-dialogs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 1efa89ddfd592b49415b0bfb28f5fbf5bcd14d6e Mon Sep 17 00:00:00 2001
-From: Morten Sørvig <morten.sorvig@qt.io>
-Date: Tue, 14 Apr 2026 18:05:46 +0200
-Subject: [PATCH] Dialogs: Use generic QtQuick.Controls import in base fallback dialogs
-
-Commit f2920663dcd3 ("Dialogs: Only import the QQC2 module used by the
-style") changed the base fallback dialog QML files to import
-QtQuick.Controls.Basic instead of QtQuick.Controls. This hardcodes the
-Basic style for the fallback, preventing the active style from being
-picked up at runtime. Only the style-specific files (+Fusion/, +Material/, etc.) should hardcode their style module.
-
-Revert the base fallback imports to use the generic QtQuick.Controls
-module so the active style is applied correctly.
-
-Fixes: QTBUG-133655
-Pick-to: 6.8 6.11
-Change-Id: Ia4b98e13858c411d0b78bdc16027093bf685ce2e
----
-
-diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml
-index c311898..d2798a7 100644
---- a/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml
-+++ b/src/quickdialogs/quickdialogsquickimpl/qml/ColorDialog.qml
-@@ -3,9 +3,8 @@
- // Qt-Security score:significant reason:default
- 
- import QtQuick
-+import QtQuick.Controls
- import QtQuick.Controls.impl
--import QtQuick.Controls.Basic
--import QtQuick.Controls.Basic.impl
- import QtQuick.Dialogs
- import QtQuick.Dialogs.quickimpl
- import QtQuick.Layouts
-diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml b/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml
-index 7307ac2..16a6fc1 100644
---- a/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml
-+++ b/src/quickdialogs/quickdialogsquickimpl/qml/ColorInputs.qml
-@@ -3,7 +3,7 @@
- // Qt-Security score:significant reason:default
- 
- import QtQuick
--import QtQuick.Controls.Basic
-+import QtQuick.Controls
- import QtQuick.Controls.impl
- import QtQuick.Layouts
- import QtQuick.Dialogs.quickimpl as DialogsQuickImpl
-diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml
-index ccc0650..f7a4ace 100644
---- a/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml
-+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FileDialog.qml
-@@ -4,9 +4,8 @@
- 
- import Qt.labs.folderlistmodel
- import QtQuick
-+import QtQuick.Controls
- import QtQuick.Controls.impl
--import QtQuick.Controls.Basic
--import QtQuick.Controls.Basic.impl
- import QtQuick.Dialogs
- import QtQuick.Dialogs.quickimpl
- import QtQuick.Layouts
-diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml
-index 3128030..546d139 100644
---- a/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml
-+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FolderDialog.qml
-@@ -4,9 +4,8 @@
- 
- import Qt.labs.folderlistmodel
- import QtQuick
-+import QtQuick.Controls
- import QtQuick.Controls.impl
--import QtQuick.Controls.Basic
--import QtQuick.Controls.Basic.impl
- import QtQuick.Dialogs
- import QtQuick.Dialogs.quickimpl
- import QtQuick.Layouts
-diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml
-index 588fb6f..eb4e48f 100644
---- a/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml
-+++ b/src/quickdialogs/quickdialogsquickimpl/qml/FontDialog.qml
-@@ -3,9 +3,8 @@
- // Qt-Security score:significant reason:default
- 
- import QtQuick
-+import QtQuick.Controls
- import QtQuick.Controls.impl
--import QtQuick.Controls.Basic
--import QtQuick.Controls.Basic.impl
- import QtQuick.Dialogs
- import QtQuick.Dialogs.quickimpl
- import QtQuick.Layouts
-diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml
-index e88a2e4..2192dfd 100644
---- a/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml
-+++ b/src/quickdialogs/quickdialogsquickimpl/qml/MessageDialog.qml
-@@ -3,9 +3,8 @@
- // Qt-Security score:significant reason:default
- 
- import QtQuick
-+import QtQuick.Controls
- import QtQuick.Controls.impl
--import QtQuick.Controls.Basic
--import QtQuick.Controls.Basic.impl
- import QtQuick.Dialogs
- import QtQuick.Dialogs.quickimpl
- import QtQuick.Layouts
-diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/SideBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/SideBar.qml
-index 1e612af..06a370b 100644
---- a/src/quickdialogs/quickdialogsquickimpl/qml/SideBar.qml
-+++ b/src/quickdialogs/quickdialogsquickimpl/qml/SideBar.qml
-@@ -3,7 +3,7 @@
- // Qt-Security score:significant reason:default
- 
- import QtQuick
--import QtQuick.Controls.Basic
-+import QtQuick.Controls
- import QtQuick.Controls.impl
- import QtQuick.Dialogs.quickimpl as DialogsQuickImpl
- 

diff --git a/qtdeclarative-qmltableinstancemodel-refactor-qmodelindex-calculation-out-of-qquicktableview.patch b/qtdeclarative-qmltableinstancemodel-refactor-qmodelindex-calculation-out-of-qquicktableview.patch
deleted file mode 100644
index c757935..0000000
--- a/qtdeclarative-qmltableinstancemodel-refactor-qmodelindex-calculation-out-of-qquicktableview.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8a2c82be6ad90e3f2a0760d8bab1e3a8cdb2473a Mon Sep 17 00:00:00 2001
-From: Richard Moe Gustavsen <richard.gustavsen@qt.io>
-Date: Mon, 27 Apr 2026 10:23:44 +0200
-Subject: [PATCH] QQmlTableInstanceModel: refactor QModelIndex calculation out
- of QQuickTableView
-
-The QQmlTableInstanceModel can derive the QModelIndex itself from the
-flat index, so there is no need for a separate object(QModelIndex)
-overload.
-
-Amends de4b7283c978ca384f6c8bf9f27387158804b601
-
-Change-Id: I9dfff8026ef0acca660f1211b0e453c46562985f
-Reviewed-by: SanthoshKumar Selvaraj <santhosh.kumar.selvaraj@qt.io>
-(cherry picked from commit e635da3faf6dac654b2591204162a217a6f02766)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/qmlmodels/qqmltableinstancemodel.cpp | 31 ++++++++++--------------
- src/qmlmodels/qqmltableinstancemodel_p.h |  1 -
- src/quick/items/qquicktableview.cpp      | 10 +-------
- 3 files changed, 14 insertions(+), 28 deletions(-)
-
-diff --git a/src/qmlmodels/qqmltableinstancemodel.cpp b/src/qmlmodels/qqmltableinstancemodel.cpp
-index dc73a17b784..5bc35a11900 100644
---- a/src/qmlmodels/qqmltableinstancemodel.cpp
-+++ b/src/qmlmodels/qqmltableinstancemodel.cpp
-@@ -165,26 +165,21 @@ QObject *QQmlTableInstanceModel::object(int index, QQmlIncubator::IncubationMode
- {
-     Q_ASSERT(m_delegate);
- 
--    QQmlDelegateModelItem *modelItem = resolveModelItem(index, QModelIndex());
--    if (!modelItem)
--        return nullptr;
--
--    // Return the incubated object, or start an async incubation task and return nullptr for now
--    return incubateModelItemIfNeeded(modelItem, incubationMode);
--}
--
--QObject *QQmlTableInstanceModel::object(const QModelIndex &modelIndex, QQmlIncubator::IncubationMode incubationMode)
--{
--    Q_ASSERT(m_delegate);
--    Q_ASSERT(m_adaptorModel.adaptsAim());
-+    QModelIndex modelIndex;
-+    if (const QAbstractItemModel *aim = abstractItemModel()) {
-+        // A valid QModelIndex is needed for resolveModelItem() to match
-+        // items in the release cache rather than just delegate type alone.
-+        const int row = m_adaptorModel.rowAt(index);
-+        const int column = m_adaptorModel.columnAt(index);
-+        modelIndex = aim->index(row, column);
-+    }
- 
--    const int flatIndex = m_adaptorModel.indexAt(modelIndex.row(), modelIndex.column());
--    QQmlDelegateModelItem *modelItem = resolveModelItem(flatIndex, modelIndex);
--    if (!modelItem)
--        return nullptr;
-+    if (QQmlDelegateModelItem *modelItem = resolveModelItem(index, modelIndex)) {
-+        // Return the incubated object, or start an async incubation task and return nullptr for now
-+        return incubateModelItemIfNeeded(modelItem, incubationMode);
-+    }
- 
--    // Return the incubated object, or start an async incubation task and return nullptr for now
--    return incubateModelItemIfNeeded(modelItem, incubationMode);
-+    return nullptr;
- }
- 
- QObject *QQmlTableInstanceModel::incubateModelItemIfNeeded(QQmlDelegateModelItem *modelItem, QQmlIncubator::IncubationMode incubationMode)
-diff --git a/src/qmlmodels/qqmltableinstancemodel_p.h b/src/qmlmodels/qqmltableinstancemodel_p.h
-index 23b6ef15972..a890b16a43b 100644
---- a/src/qmlmodels/qqmltableinstancemodel_p.h
-+++ b/src/qmlmodels/qqmltableinstancemodel_p.h
-@@ -86,7 +86,6 @@ class Q_QMLMODELS_EXPORT QQmlTableInstanceModel : public QQmlInstanceModel
-     const QAbstractItemModel *abstractItemModel() const override;
- 
-     QObject *object(int index, QQmlIncubator::IncubationMode incubationMode = QQmlIncubator::AsynchronousIfNested) override;
--    QObject *object(const QModelIndex &index, QQmlIncubator::IncubationMode incubationMode = QQmlIncubator::AsynchronousIfNested);
-     QObject *incubateModelItemIfNeeded(QQmlDelegateModelItem *modelItem, QQmlIncubator::IncubationMode incubationMode);
-     void restoreFromReleasedItemsCache(QQmlDelegateModelItem *item, int newFlatIndex);
-     void commitReleasedItems();
-diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
-index fa73aab9fca..962403aec5c 100644
---- a/src/quick/items/qquicktableview.cpp
-+++ b/src/quick/items/qquicktableview.cpp
-@@ -2826,19 +2826,11 @@ FxTableItem *QQuickTableViewPrivate::createFxTableItem(const QPoint &cell, QQmlI
-     Q_Q(QQuickTableView);
- 
-     bool ownItem = false;
--    QObject* object = nullptr;
--    const QAbstractItemModel *aim = model->abstractItemModel();
-     const int modelRow = isTransposed ? logicalColumnIndex(cell.y()) : logicalRowIndex(cell.y());
-     const int modelColumn = isTransposed ? logicalRowIndex(cell.x()) : logicalColumnIndex(cell.x());
-     const int modelIndex = modelIndexAtCell(QPoint(modelColumn, modelRow));
- 
--    if (tableModel && aim) {
--        // Prefer loading via QModelIndex so that QQmlTableInstanceModel can also
--        // match recently released items by model index, not just by delegate type.
--        object = tableModel->object(aim->index(modelRow, modelColumn), incubationMode);
--    } else {
--        object = model->object(modelIndex, incubationMode);
--    }
-+    QObject *object = model->object(modelIndex, incubationMode);
- 
-     if (!object) {
-         if (model->incubationStatus(modelIndex) == QQmlIncubator::Loading) {

diff --git a/sources b/sources
index 689fa32..5824e7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdeclarative-everywhere-src-6.11.1.tar.xz) = 91d657a33b3bf8fc79f1116561f125b3905b590e94504dcb3e4feead71f209b35b42a9da783d4568f756b22fd7a0e9802e1a9039553d400fe33417562776a1d6
+SHA512 (qtdeclarative-everywhere-src-6.11.2.tar.xz) = 012eeaeb9c492d31a71d463a8abe13ebc5ae0661677977c738082f95576befe123df80cf45bd2733ef7a5ed897693234a3a6c5e7060be01757424dca397e0056

                 reply	other threads:[~2026-08-24  6:15 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178755215922.1.3041286364618720088.rpms-qt6-qtdeclarative-e382c583192e@fedoraproject.org \
    --to=jgrulich@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox