diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-09-01 10:09:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-09-01 12:31:19 +0000 |
| commit | aa8f956e8d742ec25a01dfeb0d7a7ce54b49ed73 (patch) | |
| tree | 3f4c8c45ff08d6865fb8fed6bfed3cd6946b038d /src/qml/jsapi/qjsvalue.cpp | |
| parent | 85697da6e1fa5d02afbcef5b3138aef09764443b (diff) | |
Move ScopedCallData and ScopedStackFrame into a separate file
Change-Id: I9ae42aa7a811aa93fe0950725e9d253a0c5e8dba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsapi/qjsvalue.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index b2f8a35b51..3e2d0ccef0 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -53,7 +53,7 @@ #include "qv4errorobject_p.h" #include "private/qv8engine_p.h" #include <private/qv4mm_p.h> -#include <private/qv4scopedvalue_p.h> +#include <private/qv4jscall_p.h> #include <private/qv4qobjectwrapper_p.h> /*! @@ -657,7 +657,7 @@ QJSValue QJSValue::call(const QJSValueList &args) Q_ASSERT(engine); Scope scope(engine); - ScopedCallData callData(scope, args.length()); + ScopedCallData callData(scope, f, args.length()); callData->thisObject = engine->globalObject; for (int i = 0; i < args.size(); ++i) { if (!QJSValuePrivate::checkEngine(engine, args.at(i))) { @@ -667,7 +667,7 @@ QJSValue QJSValue::call(const QJSValueList &args) callData->args[i] = QJSValuePrivate::convertedToValue(engine, args.at(i)); } - ScopedValue result(scope, f->call(callData)); + ScopedValue result(scope, callData.call()); if (engine->hasException) result = engine->catchException(); |