diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-07-05 11:53:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 02:59:49 +0200 |
| commit | 03192f749c14ffdde24d3e1585fadf98f9750938 (patch) | |
| tree | db285bd45521e1e0799d9c3a4536ea0bdf2e8f31 /src/qml/qml/qqmlexpression.cpp | |
| parent | 7ee8156116581e08466ebc23b31e2b76c127e742 (diff) | |
Don't provide typehint in QQmlExpression::evaluate()
Previously, the result returned by QQmlExpression::evaluate() was
converted from the actual JavaScript result with a default typehint
of QList<QObject*>. This commit removes that typehint so that the
engine's conversion code will choose the most appropriate return type
for the result JavaScript value, instead.
Task-number: QTBUG-17082
Change-Id: I368a018b235e9e001b1b92db3699de377748b74f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index 8c24c4ab88..2ab412ba01 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -378,7 +378,7 @@ QVariant QQmlExpressionPrivate::value(bool *isUndefined) v8::HandleScope handle_scope; v8::Context::Scope context_scope(ep->v8engine()->context()); v8::Local<v8::Value> result = v8value(isUndefined); - rv = ep->v8engine()->toVariant(result, qMetaTypeId<QList<QObject*> >()); + rv = ep->v8engine()->toVariant(result, -1); } ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete. |