diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-25 13:52:49 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-25 06:08:56 +0200 |
commit | 5249c88dfd0ddb19c8b608a895b0b0b676aff27e (patch) | |
tree | ca85b539984903542d2b1157c8dd90dd87555551 /tests | |
parent | 647ea955f3d1c45cce978a9b85b4732baf49a040 (diff) |
Allow static alias to composite type
Task-number: QTBUG-20200
Change-Id: I2a118dfc9ce1956e038f70049c905ec38396fe5e
Reviewed-on: http://codereview.qt.nokia.com/2062
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests')
4 files changed, 30 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml new file mode 100644 index 0000000000..723b9c39fd --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType1.qml @@ -0,0 +1,6 @@ +import QtQuick 1.0 + +QtObject { + property alias group: obj + property variant foo: AliasToCompositeElementType2 { id: obj } +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml new file mode 100644 index 0000000000..4127ca4375 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/AliasToCompositeElementType2.qml @@ -0,0 +1,5 @@ +import QtQuick 1.0 + +QtObject { + property int value +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml new file mode 100644 index 0000000000..612c599184 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasToCompositeElement.qml @@ -0,0 +1,6 @@ +import QtQuick 1.0 + +AliasToCompositeElementType1 { + group.value: 13 +} + diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index d73da28212..2b02ad2d3c 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -182,6 +182,7 @@ private slots: void aliasBindingsAssignCorrectly(); void aliasBindingsOverrideTarget(); void aliasWritesOverrideBindings(); + void aliasToCompositeElement(); void realToInt(); void include(); @@ -3526,6 +3527,18 @@ void tst_qdeclarativeecmascript::aliasWritesOverrideBindings() } } +// Allow an alais to a composite element +// QTBUG-20200 +void tst_qdeclarativeecmascript::aliasToCompositeElement() +{ + QDeclarativeComponent component(&engine, TEST_FILE("aliasToCompositeElement.qml")); + + QObject *object = component.create(); + QVERIFY(object != 0); + + delete object; +} + void tst_qdeclarativeecmascript::revisionErrors() { { |