diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-09-03 13:47:48 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-09-11 14:01:55 +0200 |
| commit | ce266fbcddc48edd63c4ba8c4a6f43fb2df48153 (patch) | |
| tree | 780c112575bff245646753258fee3e50375db68b /tests/auto/qml/qmlcppcodegen | |
| parent | 398411caaf6e0713ff10daadf14531e02708aa4a (diff) | |
QtQml: Avoid double-wrapping when converting to QVariantList
Amends commit 1b89c1edcae68351632c2755e5408410c2ff98e3
Fixes: QTBUG-139764
Pick-to: 6.10 6.9 6.8
Change-Id: I1488527a235d74fc0352c72b9bfb69589c2f3d93
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Diffstat (limited to 'tests/auto/qml/qmlcppcodegen')
4 files changed, 29 insertions, 1 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt index c0da4370fc..efd95ce64f 100644 --- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt +++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt @@ -285,6 +285,7 @@ set(qml_files script.js script.mjs sequenceToIterable.qml + sequenceToIterable2.qml setLookupConversion.qml setLookupOriginalScope.qml shadowedAsCasts.qml diff --git a/tests/auto/qml/qmlcppcodegen/data/sequenceToIterable.h b/tests/auto/qml/qmlcppcodegen/data/sequenceToIterable.h index 366cadef3c..1e225b45dc 100644 --- a/tests/auto/qml/qmlcppcodegen/data/sequenceToIterable.h +++ b/tests/auto/qml/qmlcppcodegen/data/sequenceToIterable.h @@ -47,7 +47,14 @@ public: m_entries.push_back(new Entry(QStringLiteral("Item %1").arg(i), this)); } } - Q_INVOKABLE QList<Entry*> getEntries() const { return m_entries; } + Q_INVOKABLE QList<Entry *> getEntries() const { return m_entries; } + Q_INVOKABLE QList<Entry *> convertEntries(const QVariantList &entries) const + { + QList<Entry *> converted; + for (const QVariant &entry : entries) + converted.push_back(entry.value<Entry *>()); + return converted; + } private: QList<Entry*> m_entries; diff --git a/tests/auto/qml/qmlcppcodegen/data/sequenceToIterable2.qml b/tests/auto/qml/qmlcppcodegen/data/sequenceToIterable2.qml new file mode 100644 index 0000000000..d92c04c04f --- /dev/null +++ b/tests/auto/qml/qmlcppcodegen/data/sequenceToIterable2.qml @@ -0,0 +1,6 @@ +import QtQml +import TestTypes + +QtObject { + property list<Entry> converted: EntrySource.convertEntries(EntrySource.getEntries()); +} diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp index 406bcb1da8..579f279e93 100644 --- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp +++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp @@ -12,6 +12,7 @@ #include <data/objectwithmethod.h> #include <data/qmlusing.h> #include <data/resettable.h> +#include <data/sequenceToIterable.h> #include <data/takenumber.h> #include <data/weathermoduleurl.h> #include <data/withlength.h> @@ -5086,6 +5087,19 @@ void tst_QmlCppCodegen::sequenceToIterable() QVERIFY(match.hasMatch()); QCOMPARE(match.captured(1), QString::number(i)); } + + QQmlComponent component2(&engine, QUrl(u"qrc:/qt/qml/TestTypes/sequenceToIterable2.qml"_s)); + QVERIFY2(!component2.isError(), component.errorString().toUtf8()); + QScopedPointer<QObject> object2(component2.create()); + QVERIFY(!object2.isNull()); + + QQmlListReference converted(object2.data(), "converted"); + QCOMPARE(converted.count(), 10); + for (int i = 0; i < 10; ++i) { + Entry *e = qobject_cast<Entry *>(converted.at(i)); + QVERIFY(e); + QCOMPARE(e->objectName(), QStringLiteral("Item %1").arg(i)); + } } void tst_QmlCppCodegen::setLookupConversion() |