summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-01-11 06:36:06 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-01-11 06:36:06 (GMT)
commit7ff5100e6e56e1c0fe1aa6f1f0e20d16fdd789f2 (patch)
tree5ea245b63f1f9fc405eda8ab79cc54e501a3c38f /tests/auto
parentd99eac039984eb09e7fa0a91a07073a6c3769a0d (diff)
parentb60580d1de73c5dcb9c08a00c6b6f8948ac76c01 (diff)
downloadQt-7ff5100e6e56e1c0fe1aa6f1f0e20d16fdd789f2.zip
Qt-7ff5100e6e56e1c0fe1aa6f1f0e20d16fdd789f2.tar.gz
Qt-7ff5100e6e56e1c0fe1aa6f1f0e20d16fdd789f2.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/declarative/qmlecmascript/data/methods.5.qml9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.5.qml b/tests/auto/declarative/qmlecmascript/data/methods.5.qml
new file mode 100644
index 0000000..3d45b15
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/methods.5.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+Item {
+ property alias x: item.x
+ Item { id: item }
+
+ function testFunction() { return 9; }
+ property int test: testFunction();
+}