[neon/qt6/qt6-declarative/Neon/release] debian/patches: referesh patches
Carlos De Maine
null at kde.org
Wed Sep 30 05:54:31 BST 2026
Git commit 3eeca1f9ced899145bed1aba33231ffeaa8ae05c by Carlos De Maine.
Committed on 30/09/2026 at 04:54.
Pushed by carlosdem into branch 'Neon/release'.
referesh patches
M +11 -40 debian/patches/2efb7c6.diff
M +18 -23 debian/patches/8a2c82be6ad90e3f2a0760d8bab1e3a8cdb2473a.diff
https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/3eeca1f9ced899145bed1aba33231ffeaa8ae05c
diff --git a/debian/patches/2efb7c6.diff b/debian/patches/2efb7c6.diff
index d78545a..a3be8c7 100644
--- a/debian/patches/2efb7c6.diff
+++ b/debian/patches/2efb7c6.diff
@@ -28,11 +28,9 @@ Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
(cherry picked from commit 8c23f65ec4889f9ff7f609002a129698796de2b8)
---
-diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp
-index 3e11b86..e4d94e4 100644
--- a/src/qml/qml/qqmlglobal.cpp
+++ b/src/qml/qml/qqmlglobal.cpp
-@@ -1112,9 +1112,9 @@
+@@ -1111,9 +1111,9 @@
// A non-composite type will always have a metaobject.
const QMetaObject *typeMetaObject = type.metaObject();
@@ -45,7 +43,7 @@ index 3e11b86..e4d94e4 100644
if (const QQmlData *ddata = ddata_for_cast(object)) {
for (const QQmlPropertyCache *propertyCache = ddata->propertyCache.data(); propertyCache;
-@@ -1134,17 +1134,17 @@
+@@ -1133,17 +1133,17 @@
// property caches to be unrelated but the types still convertible.
// Multiple property caches can hold the same metaobject, for example for
// versions of non-composite types.
@@ -68,8 +66,6 @@ index 3e11b86..e4d94e4 100644
}
QT_END_NAMESPACE
-diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
-index 173c21d..1703c99 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -1490,6 +1490,20 @@
@@ -93,8 +89,6 @@ index 173c21d..1703c99 100644
* Look up by QQmlType and version. We only fall back to lookup by metaobject if the type
* has no revisiononed attributes here. Unspecified versions are interpreted as "any".
*/
-diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
-index 62b6cba..040a42d 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -23,6 +23,7 @@
@@ -116,11 +110,9 @@ index 62b6cba..040a42d 100644
static bool canConvert(QObject *o, QMetaType metaType);
static bool canConvert(const QQmlPropertyCache::ConstPtr &from, QMetaType metaType);
-diff --git a/src/qml/qml/qqmlmetatypedata.cpp b/src/qml/qml/qqmlmetatypedata.cpp
-index e72a3a9..41d7d8c 100644
--- a/src/qml/qml/qqmlmetatypedata.cpp
+++ b/src/qml/qml/qqmlmetatypedata.cpp
-@@ -257,6 +257,18 @@
+@@ -256,6 +256,18 @@
: propertyCacheForPotentialInlineComponentType(t, iter);
}
@@ -139,8 +131,6 @@ index e72a3a9..41d7d8c 100644
void QQmlMetaTypeData::clearCompositeTypes()
{
// Unregister all remaining composite types.
-diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h
-index ce13c40..95c60a1 100644
--- a/src/qml/qml/qqmlmetatypedata_p.h
+++ b/src/qml/qml/qqmlmetatypedata_p.h
@@ -23,6 +23,7 @@
@@ -162,8 +152,6 @@ index ce13c40..95c60a1 100644
static QQmlPropertyCache::ConstPtr propertyCacheForPotentialInlineComponentType(
QMetaType t, const QQmlMetaTypeData::CompositeTypes::const_iterator &iter);
-diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp
-index c252f47..1acbb22 100644
--- a/src/qml/qml/qqmlpropertyvalidator.cpp
+++ b/src/qml/qml/qqmlpropertyvalidator.cpp
@@ -2,6 +2,7 @@
@@ -174,7 +162,7 @@ index c252f47..1acbb22 100644
#include "qqmlpropertyvalidator_p.h"
#include <private/qqmlcustomparser_p.h>
-@@ -781,10 +782,29 @@
+@@ -776,10 +777,29 @@
// Will be true if the assigned type inherits propertyMetaObject
// Determine isAssignable value
bool isAssignable = false;
@@ -208,18 +196,12 @@ index c252f47..1acbb22 100644
}
if (!isAssignable) {
-diff --git a/tests/auto/qml/qqmllanguage/data/canQmlCastMultiEngine/Foo.qml b/tests/auto/qml/qqmllanguage/data/canQmlCastMultiEngine/Foo.qml
-new file mode 100644
-index 0000000..8fc36a4
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/canQmlCastMultiEngine/Foo.qml
@@ -0,0 +1,3 @@
+import QtQml
+
+QtObject {}
-diff --git a/tests/auto/qml/qqmllanguage/data/canQmlCastMultiEngine/Main.qml b/tests/auto/qml/qqmllanguage/data/canQmlCastMultiEngine/Main.qml
-new file mode 100644
-index 0000000..1470151
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/canQmlCastMultiEngine/Main.qml
@@ -0,0 +1,9 @@
@@ -232,9 +214,6 @@ index 0000000..1470151
+ return foo !== null;
+ }
+}
-diff --git a/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Consumer1.qml b/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Consumer1.qml
-new file mode 100644
-index 0000000..80de08e
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Consumer1.qml
@@ -0,0 +1,5 @@
@@ -243,9 +222,6 @@ index 0000000..80de08e
+QtObject {
+ property Foo f: Foo {}
+}
-diff --git a/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Consumer2.qml b/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Consumer2.qml
-new file mode 100644
-index 0000000..80de08e
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Consumer2.qml
@@ -0,0 +1,5 @@
@@ -254,30 +230,25 @@ index 0000000..80de08e
+QtObject {
+ property Foo f: Foo {}
+}
-diff --git a/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Foo.qml b/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Foo.qml
-new file mode 100644
-index 0000000..8fc36a4
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/propertyValidatorMultiEngine/Foo.qml
@@ -0,0 +1,3 @@
+import QtQml
+
+QtObject {}
-diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
-index c683aa1..0af0f34 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
-@@ -298,6 +298,8 @@
+@@ -291,6 +291,8 @@
+
+ void instanceof_data();
void instanceof();
- void instanceofMultiEngine();
- void instanceofMultiEngineInlineComponent();
-+ void propertyValidatorMultiEngine();
-+ void canQmlCastMultiEngine();
++ void instanceofMultiEngine();
++ void instanceofMultiEngineInlineComponent();
void concurrentLoadQmlDir();
-@@ -6013,6 +6015,51 @@
- QVERIFY(result2.toBool());
+@@ -5837,6 +5839,51 @@
+ }
}
+// verify that the property validator does not get confused when
diff --git a/debian/patches/8a2c82be6ad90e3f2a0760d8bab1e3a8cdb2473a.diff b/debian/patches/8a2c82be6ad90e3f2a0760d8bab1e3a8cdb2473a.diff
index 7f06355..6300f46 100644
--- a/debian/patches/8a2c82be6ad90e3f2a0760d8bab1e3a8cdb2473a.diff
+++ b/debian/patches/8a2c82be6ad90e3f2a0760d8bab1e3a8cdb2473a.diff
@@ -1,23 +1,12 @@
-diff --git a/src/qmlmodels/qqmltableinstancemodel.cpp b/src/qmlmodels/qqmltableinstancemodel.cpp
-index dc73a17b784a6493288004b8146b699f7b5cc71b..5bc35a119005b9faf2884ec7449b13f2b40cdad9 100644
--- a/src/qmlmodels/qqmltableinstancemodel.cpp
+++ b/src/qmlmodels/qqmltableinstancemodel.cpp
-@@ -165,26 +165,21 @@ QObject *QQmlTableInstanceModel::object(int index, QQmlIncubator::IncubationMode
+@@ -165,26 +165,21 @@
{
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
@@ -26,27 +15,35 @@ index dc73a17b784a6493288004b8146b699f7b5cc71b..5bc35a119005b9faf2884ec7449b13f2
+ 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);
+-}
+-
+-QObject *QQmlTableInstanceModel::object(const QModelIndex &modelIndex, QQmlIncubator::IncubationMode incubationMode)
+-{
+- Q_ASSERT(m_delegate);
+- Q_ASSERT(m_adaptorModel.adaptsAim());
+-
+- const int flatIndex = m_adaptorModel.indexAt(modelIndex.row(), modelIndex.column());
+- QQmlDelegateModelItem *modelItem = resolveModelItem(flatIndex, modelIndex);
+- if (!modelItem)
+- return nullptr;
+-
- // 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 23b6ef15972457f50e25e073df0a4490b7739b70..a890b16a43b2d36079ac01fcda1e50ae3ac6dafe 100644
--- a/src/qmlmodels/qqmltableinstancemodel_p.h
+++ b/src/qmlmodels/qqmltableinstancemodel_p.h
-@@ -86,7 +86,6 @@ public:
+@@ -86,7 +86,6 @@
const QAbstractItemModel *abstractItemModel() const override;
QObject *object(int index, QQmlIncubator::IncubationMode incubationMode = QQmlIncubator::AsynchronousIfNested) override;
@@ -54,11 +51,9 @@ index 23b6ef15972457f50e25e073df0a4490b7739b70..a890b16a43b2d36079ac01fcda1e50ae
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 fa73aab9fca26744cff2dde8946c348c294d20a1..962403aec5c598f1c933f602e4a31b33fa0320ff 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
-@@ -2826,19 +2826,11 @@ FxTableItem *QQuickTableViewPrivate::createFxTableItem(const QPoint &cell, QQmlI
+@@ -2826,19 +2826,11 @@
Q_Q(QQuickTableView);
bool ownItem = false;
More information about the Neon-commits
mailing list