diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-23 09:47:48 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-23 16:33:58 +0000 |
| commit | 7b7fb7fe3ab8ce5db744329b2f138fd8b2a811ea (patch) | |
| tree | afaa3f2bad8a66bd13d9bc2168c0af4017a6441d /tests/auto | |
| parent | d274cff81027983de6cac3553bed38e712976210 (diff) | |
Fix support for QML declared default list properties
The grammar was not permitting to write
default property list<Item> myChildren;
and instead developers had to work around it with an alias
property list<Item> myChildrenData;
default property alias myChildren: myChildrenData
which is not nice. Fortunately this is easy to fix in the grammar.
Task-number: QTBUG-10822
Change-Id: I4e914ddb9588913da09e9fb6c6aa154cf8a9e18f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/QtObjectWithChildren.qml | 5 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/defaultListProperty.qml | 6 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 9 |
3 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/QtObjectWithChildren.qml b/tests/auto/qml/qqmllanguage/data/QtObjectWithChildren.qml new file mode 100644 index 0000000000..bb28e22110 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/QtObjectWithChildren.qml @@ -0,0 +1,5 @@ +import QtQml 2.0 + +QtObject { + default property list<QtObject> myChildren; +} diff --git a/tests/auto/qml/qqmllanguage/data/defaultListProperty.qml b/tests/auto/qml/qqmllanguage/data/defaultListProperty.qml new file mode 100644 index 0000000000..d68ffd2979 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/defaultListProperty.qml @@ -0,0 +1,6 @@ +import QtQml 2.0 + +QtObjectWithChildren { + QtObject { + } +} diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index ad06946b0b..658b4f5852 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -254,6 +254,8 @@ private slots: void arrayBuffer_data(); void arrayBuffer(); + void defaultListProperty(); + private: QQmlEngine engine; QStringList defaultImportPathList; @@ -4233,6 +4235,13 @@ void tst_qqmllanguage::arrayBuffer() QCOMPARE(object->property("ok").toBool(), true); } +void tst_qqmllanguage::defaultListProperty() +{ + QQmlComponent component(&engine, testFileUrl("defaultListProperty.qml")); + VERIFY_ERRORS(0); + QScopedPointer<QObject> o(component.create()); +} + QTEST_MAIN(tst_qqmllanguage) #include "tst_qqmllanguage.moc" |