diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-03 11:57:09 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-03 11:57:09 (GMT) |
commit | ead9159c8bfa94004d29c9a0c4b4c93ecce0951e (patch) | |
tree | 5b588e4379c8525cb937cdbc0b050fc44761fbae /tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml | |
parent | 5f11d2125b9cc37768fb8174870ced5934cdacf2 (diff) | |
parent | 3838762e4b572017efc42e9f7dbfc43d262807cf (diff) | |
download | Qt-ead9159c8bfa94004d29c9a0c4b4c93ecce0951e.zip Qt-ead9159c8bfa94004d29c9a0c4b4c93ecce0951e.tar.gz Qt-ead9159c8bfa94004d29c9a0c4b4c93ecce0951e.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml')
-rw-r--r-- | tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml index 7fdd8ca..5c3ea1f 100644 --- a/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml +++ b/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml @@ -2,11 +2,11 @@ import Qt 4.6 import Qt.test 1.0 MyQmlObject { - property alias c1: MyObject.c1 + property alias c1: myObject.c1 property int c2: 3 property int c3: c2 objectProperty: QtObject { - id: MyObject + id: myObject property int c1 } } |