diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-10-20 17:19:25 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-07 09:00:48 +0000 |
| commit | e72306a6f2aeb2bddbb462c205db8fad2fb5a1a4 (patch) | |
| tree | 3b83e1cead58d97c2b055283487500472ca7d698 /src/qml/jsapi/qjsvalue.cpp | |
| parent | bc5ff76e5afe6356bebb344c9a5d8b304e852f3c (diff) | |
Further cleanup JSCallData
Avoid allocations on the JS stack if possible
Change-Id: I344cd6dceb6264314f9d22c94db22b22d1d24d14
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsapi/qjsvalue.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 654a497950..1c634467fc 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -658,7 +658,7 @@ QJSValue QJSValue::call(const QJSValueList &args) Scope scope(engine); JSCallData jsCallData(scope, args.length()); - jsCallData->thisObject = engine->globalObject; + *jsCallData->thisObject = engine->globalObject; for (int i = 0; i < args.size(); ++i) { if (!QJSValuePrivate::checkEngine(engine, args.at(i))) { qWarning("QJSValue::call() failed: cannot call function with argument created in a different engine"); @@ -714,7 +714,7 @@ QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList } JSCallData jsCallData(scope, args.size()); - jsCallData->thisObject = QJSValuePrivate::convertedToValue(engine, instance); + *jsCallData->thisObject = QJSValuePrivate::convertedToValue(engine, instance); for (int i = 0; i < args.size(); ++i) { if (!QJSValuePrivate::checkEngine(engine, args.at(i))) { qWarning("QJSValue::call() failed: cannot call function with argument created in a different engine"); |