diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-02-02 14:24:40 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-03 11:37:04 +0000 |
commit | 045718e821d1d1f1d5732f123c7a9c189bd92b19 (patch) | |
tree | 7cad1fc294ebc838825d86e1b2b1e8fe773d3fad | |
parent | e655719687f339bef0bb2def577f73932367eb02 (diff) |
QQmlIRLoader: Actually load RequiredPropertyExtraData
If a QML component wants to mark properties of its "parent" component as
required, it can do so via
required propertyName
The information about those properties is stored in a
RequiredPropertyExtraData data structure. This structure is already
serialized to disk in the QQmlIRWriter. However, we neglected to restore
it so far in the loader.
Fixes: QTBUG-90538
Change-Id: I789daff9bc881e4f35c942c77f5116b5284de81b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit b322a971f06823a4356f2b3aa331501aa4d0dc7f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/qml/qml/qqmlirloader.cpp | 7 | ||||
-rw-r--r-- | tests/auto/qml/qmlcachegen/data/posthocrequired.qml | 5 | ||||
-rw-r--r-- | tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp | 12 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlirloader.cpp b/src/qml/qml/qqmlirloader.cpp index c9ba2f44cf..609e01f8e3 100644 --- a/src/qml/qml/qqmlirloader.cpp +++ b/src/qml/qml/qqmlirloader.cpp @@ -208,6 +208,13 @@ QmlIR::Object *QQmlIRLoader::loadObject(const QV4::CompiledData::Object *seriali object->inlineComponents->append(ic); } + const QV4::CompiledData::RequiredPropertyExtraData *serializedRequiredPropertyExtraData = serializedObject->requiredPropertyExtraDataTable(); + for (uint i = 0u; i < serializedObject->nRequiredPropertyExtraData; ++i, ++serializedRequiredPropertyExtraData) { + QmlIR::RequiredPropertyExtraData *extra = pool->New<QmlIR::RequiredPropertyExtraData>(); + *static_cast<QV4::CompiledData::RequiredPropertyExtraData *>(extra) = *serializedRequiredPropertyExtraData; + object->requiredPropertyExtraDatas->append(extra); + } + return object; } diff --git a/tests/auto/qml/qmlcachegen/data/posthocrequired.qml b/tests/auto/qml/qmlcachegen/data/posthocrequired.qml new file mode 100644 index 0000000000..3b32d9fe8f --- /dev/null +++ b/tests/auto/qml/qmlcachegen/data/posthocrequired.qml @@ -0,0 +1,5 @@ +import QtQuick 2.15 + +Item { + required x +} diff --git a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp index c5602eda7d..3810f505b3 100644 --- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp +++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp @@ -77,6 +77,7 @@ private slots: void parameterAdjustment(); void inlineComponent(); + void posthocRequired(); }; // A wrapper around QQmlComponent to ensure the temporary reference counts @@ -701,6 +702,17 @@ void tst_qmlcachegen::inlineComponent() QVERIFY(!obj.isNull()); } +void tst_qmlcachegen::posthocRequired() +{ + bool ok = generateCache(testFile("posthocrequired.qml")); + QVERIFY(ok); + QQmlEngine engine; + CleanlyLoadingComponent component(&engine, testFileUrl("posthocrequired.qml")); + QScopedPointer<QObject> obj(component.create()); + QVERIFY(obj.isNull() && component.isError()); + QVERIFY(component.errorString().contains(QStringLiteral("Required property x was not initialized"))); +} + QTEST_GUILESS_MAIN(tst_qmlcachegen) #include "tst_qmlcachegen.moc" |