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 2025-10-24 17:22:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-declarative (Old)
and /work/SRC/openSUSE:Factory/.qt6-declarative.new.1980 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-declarative"
Fri Oct 24 17:22:56 2025 rev:56 rq:1313168 version:6.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-declarative/qt6-declarative.changes
2025-10-13 17:26:15.784602835 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-declarative.new.1980/qt6-declarative.changes
2025-10-24 17:23:08.306663255 +0200
@@ -1,0 +2,6 @@
+Thu Oct 23 08:48:59 UTC 2025 - Christophe Marin <[email protected]>
+
+- Add upstream change (kde#509804)
+ * 0001-QmlCompiler-Fix-write-access-to-QVariantMap.patch
+
+-------------------------------------------------------------------
New:
----
0001-QmlCompiler-Fix-write-access-to-QVariantMap.patch
----------(New B)----------
New:- Add upstream change (kde#509804)
* 0001-QmlCompiler-Fix-write-access-to-QVariantMap.patch
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-declarative.spec ++++++
--- /var/tmp/diff_new_pack.jSxHSk/_old 2025-10-24 17:23:09.338706697 +0200
+++ /var/tmp/diff_new_pack.jSxHSk/_new 2025-10-24 17:23:09.342706866 +0200
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
# boo#1249054 - LTO fails on armv6/7 since 6.9.2
%ifarch %{arm}
%define _lto_cflags %{nil}
@@ -40,6 +41,8 @@
Source99: qt6-declarative-rpmlintrc
# PATCH-FIX-OPENSUSE
Patch0: 0001-qmlimportscanner-Include-module-versions-again.patch
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-QmlCompiler-Fix-write-access-to-QVariantMap.patch
BuildRequires: memory-constraints
BuildRequires: pkgconfig
BuildRequires: python3-base
@@ -507,8 +510,8 @@
Summary: Non-ABI stable API for the Qt 6 LabsQmlModels library
License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only
Requires: libQt6LabsQmlModels6 = %{version}
-Requires: cmake(Qt6QmlPrivate) = %{real_version}
Requires: cmake(Qt6QmlModelsPrivate) = %{real_version}
+Requires: cmake(Qt6QmlPrivate) = %{real_version}
Provides: qt6-labsqmlmodels-devel = %{version}
Obsoletes: qt6-labsqmlmodels-devel < %{version}
@@ -979,12 +982,12 @@
%package -n qt6-quickcontrolstestutils-devel-static
Summary: Qt6 QuickControlsTestUtils static library
License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only
+Requires: qt6-quicktestutils-devel-static = %{version}
Requires: cmake(Qt6QuickControls2) = %{real_version}
Requires: cmake(Qt6QuickDialogs2QuickImpl) = %{real_version}
Requires: cmake(Qt6QuickPrivate) = %{real_version}
Requires: cmake(Qt6QuickTemplates2) = %{real_version}
Requires: cmake(Qt6Test) = %{real_version}
-Requires: qt6-quicktestutils-devel-static = %{version}
%description -n qt6-quickcontrolstestutils-devel-static
The Qt6 QuickControlsTestUtils static library.
++++++ 0001-QmlCompiler-Fix-write-access-to-QVariantMap.patch ++++++
>From efc81ac897f7ba933e3add1ce725cc69acdaca7b Mon Sep 17 00:00:00 2001
From: Ulf Hermann <[email protected]>
Date: Mon, 6 Oct 2025 10:09:01 +0200
Subject: [PATCH] QmlCompiler: Fix write access to QVariantMap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Without this, it tries to resolve the metaObject of QVariantMap, which
crashes.
Amends commit cca07aa78841f2d743f0b4d933abb0dd66f0b948.
Fixes: QTBUG-139626
Pick-to: 6.8
Change-Id: Id747429ed0d558932b9a6cb8f59e3740982efb56
Reviewed-by: Olivier De Cannière <[email protected]>
(cherry picked from commit f5e34266ea15c6e44e9816f01f4e627d5f038f0c)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
---
src/qmlcompiler/qqmljscodegenerator.cpp | 52 ++++++++++++++++---
src/qmlcompiler/qqmljscodegenerator_p.h | 5 +-
.../qml/qmlcppcodegen/data/variantMapLookup.h | 21 ++++++--
.../qmlcppcodegen/data/variantMapLookup.qml | 18 +++++++
.../qml/qmlcppcodegen/tst_qmlcppcodegen.cpp | 6 +++
5 files changed, 89 insertions(+), 13 deletions(-)
diff --git a/src/qmlcompiler/qqmljscodegenerator.cpp
b/src/qmlcompiler/qqmljscodegenerator.cpp
index bf95f74..e90a038 100644
--- a/src/qmlcompiler/qqmljscodegenerator.cpp
+++ b/src/qmlcompiler/qqmljscodegenerator.cpp
@@ -1471,7 +1471,7 @@ void QQmlJSCodeGenerator::generate_GetLookup(int index)
generate_GetLookupHelper(index);
}
-QString QQmlJSCodeGenerator::generateVariantMapLookup(
+QString QQmlJSCodeGenerator::generateVariantMapGetLookup(
const QString &map, const int nameIndex)
{
const QString mapLookup = map
@@ -1482,6 +1482,18 @@ QString QQmlJSCodeGenerator::generateVariantMapLookup(
+ u";\n"_s;
}
+QString QQmlJSCodeGenerator::generateVariantMapSetLookup(
+ const QString &map, const int nameIndex,
+ const QQmlJSScope::ConstPtr &property, const QString &variableIn)
+{
+ const QString mapLookup = map
+ + u"["_s +
QQmlJSUtils::toLiteral(m_jsUnitGenerator->lookupName(nameIndex)) + u"]"_s;
+
+ return mapLookup + u" = "_s
+ + conversion(property, m_typeResolver->varType(), variableIn)
+ + u";\n"_s;
+}
+
void QQmlJSCodeGenerator::generate_GetLookupHelper(int index)
{
if (m_state.accumulatorOut().isMethod())
@@ -1627,7 +1639,7 @@ void QQmlJSCodeGenerator::generate_GetLookupHelper(int
index)
REJECT(u"access to 'length' property of sequence wrapped in
non-sequence"_s);
}
} else if (accumulatorIn.isStoredIn(m_typeResolver->variantMapType())) {
- m_body += generateVariantMapLookup(m_state.accumulatorVariableIn,
index);
+ m_body += generateVariantMapGetLookup(m_state.accumulatorVariableIn,
index);
} else {
if (m_state.isRegisterAffectedBySideEffects(Accumulator))
REJECT(u"reading from a value that's potentially affected by side
effects"_s);
@@ -1638,7 +1650,7 @@ void QQmlJSCodeGenerator::generate_GetLookupHelper(int
index)
m_jsUnitGenerator->lookupName(index)));
if (scope.contains(m_typeResolver->variantMapType())) {
- m_body += generateVariantMapLookup(
+ m_body += generateVariantMapGetLookup(
u"(*static_cast<const QVariantMap *>("_s
+ inputContentPointer + u"))"_s, index);
return;
@@ -1698,6 +1710,15 @@ void QQmlJSCodeGenerator::generate_StoreProperty(int
nameIndex, int baseReg)
REJECT(u"StoreProperty"_s);
}
+// TODO: This shouldn't be necessary. If the content can be stored directly,
then it should
+// be stored and used directly. If it cannot be stored directly, it
should be stored
+// as QVariant, but then we cannot dereference the content pointer
either.
+static QString derefContentPointer(const QString &contentPointer)
+{
+ Q_ASSERT(contentPointer.startsWith(u'&') ||
contentPointer[0].isLetterOrNumber());
+ return contentPointer.startsWith(u'&') ? contentPointer.mid(1) : (u'*' +
contentPointer);
+}
+
void QQmlJSCodeGenerator::generate_SetLookup(int index, int baseReg)
{
INJECT_TRACE_INFO(generate_SetLookup);
@@ -1706,8 +1727,9 @@ void QQmlJSCodeGenerator::generate_SetLookup(int index,
int baseReg)
const QQmlJSScope::ConstPtr valueType =
m_state.accumulatorIn().storedType();
const QQmlJSRegisterContent property = m_state.readAccumulator();
Q_ASSERT(property.isConversion());
- const QQmlJSScope::ConstPtr originalScope
- =
m_typeResolver->original(property.conversionResultScope()).containedType();
+ const QQmlJSRegisterContent original
+ = m_typeResolver->original(property.conversionResultScope());
+ const QQmlJSScope::ConstPtr originalScope = original.containedType();
if (property.storedType().isNull()) {
REJECT(u"SetLookup. Could not find property "
@@ -1757,9 +1779,7 @@ void QQmlJSCodeGenerator::generate_SetLookup(int index,
int baseReg)
// We can resize without write back on a list property because it's
actually a reference.
m_body += u"const int begin = "_s + object + u".count(&" + object +
u");\n"_s;
- m_body += u"const int end = "_s
- + (variableIn.startsWith(u'&') ? variableIn.mid(1) : (u'*' +
variableIn))
- + u";\n"_s;
+ m_body += u"const int end = "_s + derefContentPointer(variableIn) +
u";\n"_s;
m_body += u"for (int i = begin; i < end; ++i)\n"_s;
m_body += u" "_s + object + u".append(&"_s + object + u",
nullptr);\n"_s;
m_body += u"for (int i = begin; i > end; --i)\n"_s;
@@ -1769,10 +1789,26 @@ void QQmlJSCodeGenerator::generate_SetLookup(int index,
int baseReg)
}
case QQmlJSScope::AccessSemantics::Value: {
const QQmlJSRegisterContent base = registerType(baseReg);
+ if (base.isStoredIn(m_typeResolver->variantMapType())) {
+ m_body += generateVariantMapSetLookup(
+ registerVariable(baseReg), index, property.storedType(),
+ derefContentPointer(variableIn));
+ generateWriteBack(baseReg);
+ break;
+ }
const QString baseContentPointer = resolveValueTypeContentPointer(
originalScope, base, object,
u"TypeError: Value is %1 and could not be converted to an
object"_s);
+ if (original.contains(m_typeResolver->variantMapType())) {
+ m_body += generateVariantMapSetLookup(
+ u"(*static_cast<const QVariantMap *>("_s
+ + baseContentPointer + u"))"_s, index,
property.storedType(),
+ derefContentPointer(variableIn));
+ generateWriteBack(baseReg);
+ break;
+ }
+
const QString lookup = u"aotContext->setValueLookup("_s + indexString
+ u", "_s + baseContentPointer
+ u", "_s + variableIn + u')';
diff --git a/src/qmlcompiler/qqmljscodegenerator_p.h
b/src/qmlcompiler/qqmljscodegenerator_p.h
index 65f8301..a61b189 100644
--- a/src/qmlcompiler/qqmljscodegenerator_p.h
+++ b/src/qmlcompiler/qqmljscodegenerator_p.h
@@ -365,7 +365,10 @@ private:
const QQmlJSMetaMethod &ctor, const QList<QQmlJSRegisterContent>
&argumentTypes,
const QStringList &arguments, const QString &metaType, const
QString &metaObject);
- QString generateVariantMapLookup(const QString &map, const int nameIndex);
+ QString generateVariantMapGetLookup(const QString &map, const int
nameIndex);
+ QString generateVariantMapSetLookup(
+ const QString &map, const int nameIndex, const
QQmlJSScope::ConstPtr &property,
+ const QString &variableIn);
QQmlJSRegisterContent originalType(QQmlJSRegisterContent tracked)
{
diff --git a/tests/auto/qml/qmlcppcodegen/data/variantMapLookup.h
b/tests/auto/qml/qmlcppcodegen/data/variantMapLookup.h
index de7ac4f..c1e5206 100644
--- a/tests/auto/qml/qmlcppcodegen/data/variantMapLookup.h
+++ b/tests/auto/qml/qmlcppcodegen/data/variantMapLookup.h
@@ -7,19 +7,32 @@ class VariantMapLookupFoo : public QObject
{
Q_OBJECT
QML_ELEMENT
- Q_PROPERTY(QVariantMap data READ data CONSTANT)
- Q_PROPERTY(QList<QVariantMap> many READ many CONSTANT)
+ Q_PROPERTY(QVariantMap data READ data WRITE setData NOTIFY dataChanged)
+ Q_PROPERTY(QList<QVariantMap> many READ many NOTIFY dataChanged)
public:
VariantMapLookupFoo(QObject *parent = nullptr) : QObject(parent) { }
-private:
- QVariantMap data() const { return { { QStringLiteral("value"), 42 } }; }
+ QVariantMap data() const { return m_data; }
+ void setData(const QVariantMap &data)
+ {
+ if (data == m_data)
+ return;
+ m_data = data;
+ emit dataChanged();
+ }
+
QList<QVariantMap> many() const
{
const QVariantMap one = data();
return QList<QVariantMap>({one, one, one});
}
+
+signals:
+ void dataChanged();
+
+private:
+ QVariantMap m_data;
};
diff --git a/tests/auto/qml/qmlcppcodegen/data/variantMapLookup.qml
b/tests/auto/qml/qmlcppcodegen/data/variantMapLookup.qml
index 45cb0ed..75b4fd0 100644
--- a/tests/auto/qml/qmlcppcodegen/data/variantMapLookup.qml
+++ b/tests/auto/qml/qmlcppcodegen/data/variantMapLookup.qml
@@ -3,10 +3,28 @@ import TestTypes
import QtQuick
Item {
+ id: root
property int i: moo.data.value
property int j: moo.many[1].value
+ property string foo: moo.data.foo
VariantMapLookupFoo {
id: moo
+ data: {
+ let result = { value: 42 };
+ switch(root.visible) {
+ case true:
+ result.foo = "blue";
+ break;
+ case false:
+ result.foo = "green";
+ break;
+ }
+ return result;
+ }
+ }
+
+ function doI() {
+ moo.data.value = i + 1
}
}
diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
index 406bcb1..9b55898 100644
--- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
+++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
@@ -5887,6 +5887,12 @@ void tst_QmlCppCodegen::variantMapLookup()
QVERIFY(!o.isNull());
QCOMPARE(o->property("i"), 42);
QCOMPARE(o->property("j"), 42);
+ QCOMPARE(o->property("foo"), u"blue"_s);
+
+ QMetaObject::invokeMethod(o.data(), "doI");
+ QCOMPARE(o->property("i"), 43);
+ QCOMPARE(o->property("j"), 43);
+ QCOMPARE(o->property("foo"), u"blue"_s);
}
void tst_QmlCppCodegen::variantReturn()
--
2.51.1
