diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:56:47 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:56:47 (GMT) |
| commit | 0c558e05f880cb51078b2d5e5281227352c1de3f (patch) | |
| tree | 809e95ab06fc5d757c1d66493de5c9376866aee1 /tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml | |
| parent | af81ea8a5abbd9a94eb6ab5c3fe0425779905d5a (diff) | |
| parent | 48fd47f64f3f73e82016161d82cdf67908a9c653 (diff) | |
| download | Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.zip Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.tar.gz Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml index 3d45b15..5ba324a 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml @@ -1,7 +1,7 @@ import Qt 4.6 Item { - property alias x: item.x + property alias blah: item.x Item { id: item } function testFunction() { return 9; } |