summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-14 04:49:39 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-14 04:49:39 (GMT)
commita598867353ed121e0b55e82af69253d0e94bb487 (patch)
tree1cdbd3cef513010d706fa6218abc43b9d78eac15 /src/declarative
parentb1008e6a4f660866265083f6f4bd321a85cff377 (diff)
downloadQt-a598867353ed121e0b55e82af69253d0e94bb487.zip
Qt-a598867353ed121e0b55e82af69253d0e94bb487.tar.gz
Qt-a598867353ed121e0b55e82af69253d0e94bb487.tar.bz2
Array expressions test
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/qmlengine.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 227aeb0..b2d3a9c 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1027,9 +1027,7 @@ QVariant QmlExpression::value()
}
rv = QVariant::fromValue(list);
}
- } /*else if (svalue.isVariant()) {
- rv = svalue.toVariant();
- }*/ else if (svalue.isObject()) {
+ } else if (svalue.isObject()) {
QScriptValue objValue = svalue.data();
if (objValue.isValid())
rv = objValue.toVariant();