Showing the changes to libraries/script-engine/src/AssetScriptingInterface.cpp (1 of 3 files). Show all
Unified · Split
| @@ -43,7 +43,7 @@ STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){ · 42 unmodified lines | |||
| 43 | })); | 43 | })); |
| 44 | 44 | ||
| 45 | 45 | ||
| 46 | AssetScriptingInterface::AssetScriptingInterface(QObject* parent) : BaseAssetScriptingInterface(parent) { | 46 | AssetScriptingInterface::AssetScriptingInterface(ScriptManager* parent) : BaseAssetScriptingInterface(parent), _scriptManager(parent) { |
| 47 | qCDebug(scriptengine) << "AssetScriptingInterface::AssetScriptingInterface" << parent; | 47 | qCDebug(scriptengine) << "AssetScriptingInterface::AssetScriptingInterface" << parent; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| @@ -246,7 +246,7 @@ void AssetScriptingInterface::jsCallback(const ScriptValue& handler, · 196 unmodified lines | |||
| 246 | Q_ASSERT(thread() == QThread::currentThread()); | 246 | Q_ASSERT(thread() == QThread::currentThread()); |
| 247 | Q_ASSERT(engine); | 247 | Q_ASSERT(engine); |
| 248 | //V8TODO: which kind of script context guard needs to be used here? | 248 | //V8TODO: which kind of script context guard needs to be used here? |
| 249 | ScriptContextGuard scriptContextGuard(engine()->currentContext()); | 249 | ScriptContextGuard scriptContextGuard(_scriptManager->engine()->currentContext()); |
| 250 | auto errorValue = !error.toBool() ? engine()->nullValue() : error; | 250 | auto errorValue = !error.toBool() ? engine()->nullValue() : error; |
| 251 | JS_VERIFY(handler.isObject() && handler.property("callback").isFunction(), | 251 | JS_VERIFY(handler.isObject() && handler.property("callback").isFunction(), |
| 252 | QString("jsCallback -- .callback is not a function (%1)") | 252 | QString("jsCallback -- .callback is not a function (%1)") |