diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-06-23 01:28:59 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-06-23 01:28:59 (GMT) |
| commit | dd792c28d89fbdc23de0d40143f0ca900c6c4daa (patch) | |
| tree | f5ff42fdce29d6b4dfe92f6171073d39ec8bc4a6 /src | |
| parent | 23acbf18ce1253628a4fae9743017756b9d97e16 (diff) | |
| parent | 186fc75771a579c51b08e96605f18dc65fb62b02 (diff) | |
| download | Qt-dd792c28d89fbdc23de0d40143f0ca900c6c4daa.zip Qt-dd792c28d89fbdc23de0d40143f0ca900c6c4daa.tar.gz Qt-dd792c28d89fbdc23de0d40143f0ca900c6c4daa.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qmlcustomparser.cpp | 1 |
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); |