diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-04 07:23:39 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-04 07:23:39 (GMT) |
| commit | 15f0fb150b924b890a8285fda8f10134f76d263c (patch) | |
| tree | f2fb6177647c4aa45e6e9598537a55d656283d16 /tests/auto | |
| parent | 2d6b1a1975af87c33fc45d2da3bfc7d2668135c9 (diff) | |
| parent | c871d201a65b1524c0590e2d6ad77b8666338b08 (diff) | |
| download | Qt-15f0fb150b924b890a8285fda8f10134f76d263c.zip Qt-15f0fb150b924b890a8285fda8f10134f76d263c.tar.gz Qt-15f0fb150b924b890a8285fda8f10134f76d263c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto')
| -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; } |