diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-05-14 00:17:40 (GMT) |
| commit | 124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (patch) | |
| tree | 518c22b7317c5646d2ce0adc5deb5818b2ea0af6 /tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml | |
| parent | dcc9a7e72fe4c283df59378d08d75aecfa3b3b05 (diff) | |
| parent | ac519ee416e06f4ab471f102da306f94de21c90d (diff) | |
| download | Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.zip Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.gz Qt-124e9a761b3cab7414d3ddeaa8e8f2455b6598ad.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
examples/declarative/dial/dial-example.qml
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml index 5af3d6e..bac704e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml @@ -10,5 +10,7 @@ QtObject { property variant test7: "10x10" property variant test8: "100,100,100" property variant test9: String("#FF008800") + property variant test10: true + property variant test11: false } |