summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-05 03:37:14 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-05 03:37:14 (GMT)
commitc7ac041e5180d118e300a050d9c579467230a48c (patch)
tree396f19b89df7a8da97f459385f4f5ceff58ccede /tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
parent9b7e3943b0e67af48fdbb993c5c4cc93dac81304 (diff)
parenta2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25 (diff)
downloadQt-c7ac041e5180d118e300a050d9c579467230a48c.zip
Qt-c7ac041e5180d118e300a050d9c579467230a48c.tar.gz
Qt-c7ac041e5180d118e300a050d9c579467230a48c.tar.bz2
Merge remote branch 'staging/4.7' into bearermanagement/polling
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
index 57a6070..e48526a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
@@ -1,5 +1,5 @@
import Test 1.0
MyTypeObject {
- intProperty : MyCompositeValueSource {}
+ MyCompositeValueSource on intProperty {}
}