summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-26 01:22:34 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-26 01:22:34 (GMT)
commit7fc5d5e693a6a7f4c2bd040b8d6f29fd33a01712 (patch)
tree54198784bfd93facfbf126f1c993138995419601
parent4058b501914216bf28ab62c02b78abcbf7f5a3c9 (diff)
downloadQt-7fc5d5e693a6a7f4c2bd040b8d6f29fd33a01712.zip
Qt-7fc5d5e693a6a7f4c2bd040b8d6f29fd33a01712.tar.gz
Qt-7fc5d5e693a6a7f4c2bd040b8d6f29fd33a01712.tar.bz2
Always treat CSS-like suffix's as bindings
-rw-r--r--src/declarative/qml/qmlscriptparser.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 07f6b17..fde2771 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -542,7 +542,11 @@ QmlParser::Variant ProcessAST::getVariant(AST::ExpressionNode *expr)
} else if (expr->kind == AST::Node::Kind_FalseLiteral) {
return QmlParser::Variant(false);
} else if (AST::NumericLiteral *lit = AST::cast<AST::NumericLiteral *>(expr)) {
- return QmlParser::Variant(lit->value, asString(expr));
+ if (lit->suffix == AST::NumericLiteral::noSuffix)
+ return QmlParser::Variant(lit->value, asString(expr));
+ else
+ return QmlParser::Variant(asString(expr), QmlParser::Variant::Script);
+
} else {
if (AST::UnaryMinusExpression *unaryMinus = AST::cast<AST::UnaryMinusExpression *>(expr)) {