diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-02 15:07:35 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-09 10:27:57 +0100 |
| commit | ca977a0c8fa25d5df4dbddba08bc2fb022df7c1c (patch) | |
| tree | 24953329bba5bbb7ea8611d09098b8a6c8ba39c3 /src/qml/qml/qqmlbinding.cpp | |
| parent | 7041eb353a4ad416f51245cc17342e16b3a02a9b (diff) | |
Cleanup variant conversion code
Make public methods proper members of the ExecutionEngine, and
move private methods into the .cpp file only.
Change-Id: I3ca49e39bb1c4e559a2c63346e6ae6cfa446147d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
| -rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 6e45ca8bbb..61bcb260f7 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -260,7 +260,7 @@ QVariant QQmlBinding::evaluate() ep->dereferenceScarceResources(); - return QV4::ExecutionEngine::toVariant(scope.engine, result, qMetaTypeId<QList<QObject*> >()); + return scope.engine->toVariant(result, qMetaTypeId<QList<QObject*> >()); } QString QQmlBinding::expressionIdentifier(QQmlJavaScriptExpression *e) |