diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-23 23:17:06 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-23 23:17:06 (GMT) |
| commit | 31540e4b5177073d71b98e296ad7d59faf63b383 (patch) | |
| tree | 6eaf3e50b1a351171db3d47b8e39e0ee7478bc54 /tests/auto/declarative/qmllanguage/data/scriptString.qml | |
| parent | 7d93b0762aff8bcd9cb22f12ebc88beb242f2a97 (diff) | |
| parent | 8d263b7cbf6b0bd17deeb8b56c90e0232057b832 (diff) | |
| download | Qt-31540e4b5177073d71b98e296ad7d59faf63b383.zip Qt-31540e4b5177073d71b98e296ad7d59faf63b383.tar.gz Qt-31540e4b5177073d71b98e296ad7d59faf63b383.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative/qmllanguage/data/scriptString.qml')
| -rw-r--r-- | tests/auto/declarative/qmllanguage/data/scriptString.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qmllanguage/data/scriptString.qml b/tests/auto/declarative/qmllanguage/data/scriptString.qml index 51e6e48..40a3bbe 100644 --- a/tests/auto/declarative/qmllanguage/data/scriptString.qml +++ b/tests/auto/declarative/qmllanguage/data/scriptString.qml @@ -2,5 +2,5 @@ import Test 1.0 MyTypeObject { scriptProperty: foo + bar - grouped.script: print(1921) + grouped.script: console.log(1921) } |