summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-06-23 06:07:11 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-06-23 06:07:11 (GMT)
commit6d7120dc2081e10c46ffe8467b047affe81ed747 (patch)
treec454785971f36b8cab970f919d6a89c03685a260 /src/declarative/qml
parentb418419f23cec0880b6b351d304b1a755f82ab73 (diff)
parentdd792c28d89fbdc23de0d40143f0ca900c6c4daa (diff)
downloadQt-6d7120dc2081e10c46ffe8467b047affe81ed747.zip
Qt-6d7120dc2081e10c46ffe8467b047affe81ed747.tar.gz
Qt-6d7120dc2081e10c46ffe8467b047affe81ed747.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qmlcustomparser.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp
index 2e8c8f6..c90ab47 100644
--- a/src/declarative/qml/qmlcustomparser.cpp
+++ b/src/declarative/qml/qmlcustomparser.cpp
@@ -136,6 +136,7 @@ QmlCustomParserNodePrivate::fromProperty(QmlParser::Property *p)
} else {
for(int ii = 0; ii < p->values.count(); ++ii) {
Value *v = p->values.at(ii);
+ v->type = QmlParser::Value::Literal;
if(v->object) {
QmlCustomParserNode node = fromObject(v->object);