Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-declarative for openSUSE:Factory
checked in at 2026-05-28 17:24:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-declarative (Old)
and /work/SRC/openSUSE:Factory/.qt6-declarative.new.1937 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-declarative"
Thu May 28 17:24:37 2026 rev:62 rq:1355417 version:6.11.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-declarative/qt6-declarative.changes
2026-03-28 20:12:52.040225027 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-declarative.new.1937/qt6-declarative.changes
2026-05-28 17:25:22.799846617 +0200
@@ -1,0 +2,12 @@
+Sun May 24 07:28:59 UTC 2026 - Christophe Marin <[email protected]>
+
+- Add upstream fix (kde#520252)
+ * 0001-QQmlTableInstanceModel-refactor-QModelIndex-calculat.patch
+
+-------------------------------------------------------------------
+Thu May 14 14:54:46 UTC 2026 - Christophe Marin <[email protected]>
+
+- Update to 6.11.1
+ https://www.qt.io/blog/qt-6.11.1-released
+
+-------------------------------------------------------------------
Old:
----
qtdeclarative-everywhere-src-6.11.0.tar.xz
New:
----
0001-QQmlTableInstanceModel-refactor-QModelIndex-calculat.patch
qtdeclarative-everywhere-src-6.11.1.tar.xz
----------(New B)----------
New:- Add upstream fix (kde#520252)
* 0001-QQmlTableInstanceModel-refactor-QModelIndex-calculat.patch
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-declarative.spec ++++++
--- /var/tmp/diff_new_pack.w8EMYu/_old 2026-05-28 17:25:25.707966994 +0200
+++ /var/tmp/diff_new_pack.w8EMYu/_new 2026-05-28 17:25:25.723967656 +0200
@@ -21,7 +21,7 @@
%define _lto_cflags %{nil}
%endif
-%define real_version 6.11.0
+%define real_version 6.11.1
%define short_version 6.11
%define tar_name qtdeclarative-everywhere-src
%define tar_suffix %{nil}
@@ -32,7 +32,7 @@
%endif
#
Name: qt6-declarative%{?pkg_suffix}
-Version: 6.11.0
+Version: 6.11.1
Release: 0
Summary: Qt 6 Declarative Libraries and tools
License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only
@@ -41,6 +41,8 @@
Source99: qt6-declarative-rpmlintrc
# PATCH-FIX-OPENSUSE
Patch0: 0001-qmlimportscanner-Include-module-versions-again.patch
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-QQmlTableInstanceModel-refactor-QModelIndex-calculat.patch
BuildRequires: memory-constraints
BuildRequires: pkgconfig
BuildRequires: python3-base
++++++ 0001-QQmlTableInstanceModel-refactor-QModelIndex-calculat.patch ++++++
>From 8a2c82be6ad90e3f2a0760d8bab1e3a8cdb2473a Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <[email protected]>
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 <[email protected]>
(cherry picked from commit e635da3faf6dac654b2591204162a217a6f02766)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
---
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 dc73a17b78..5bc35a1190 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 23b6ef1597..a890b16a43 100644
--- a/src/qmlmodels/qqmltableinstancemodel_p.h
+++ b/src/qmlmodels/qqmltableinstancemodel_p.h
@@ -86,7 +86,6 @@ public:
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 fa73aab9fc..962403aec5 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) {
--
2.54.0
++++++ qtdeclarative-everywhere-src-6.11.0.tar.xz ->
qtdeclarative-everywhere-src-6.11.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/qt6-declarative/qtdeclarative-everywhere-src-6.11.0.tar.xz
/work/SRC/openSUSE:Factory/.qt6-declarative.new.1937/qtdeclarative-everywhere-src-6.11.1.tar.xz
differ: char 25, line 1
