Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 4 files). Show all
Unified · Split
| @@ -133,7 +133,7 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) { · 132 unmodified lines | |||
| 133 | QObject* scriptsModel(); | 133 | QObject* scriptsModel(); |
| 134 | 134 | ||
| 135 | bool NativeScriptInitializers::registerNativeScriptInitializer(NativeScriptInitializer initializer) { | 135 | bool NativeScriptInitializers::registerNativeScriptInitializer(NativeScriptInitializer initializer) { |
| 136 | return registerScriptInitializer([=](ScriptEnginePointer engine) { | 136 | return registerScriptInitializer([initializer](ScriptEnginePointer engine) { |
| 137 | initializer(qobject_cast<QScriptEngine*>(engine.data())); | 137 | initializer(qobject_cast<QScriptEngine*>(engine.data())); |
| 138 | }); | 138 | }); |
| 139 | } | 139 | } |
| @@ -563,10 +563,10 @@ int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) { · 423 unmodified lines | |||
| 563 | 563 | ||
| 564 | void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) { | 564 | void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) { |
| 565 | connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::onScriptFinished, Qt::DirectConnection); | 565 | connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::onScriptFinished, Qt::DirectConnection); |
| 566 | connect(scriptEngine.data(), &ScriptEngine::loadScript, [&](const QString& scriptName, bool userLoaded) { | 566 | connect(scriptEngine.data(), &ScriptEngine::loadScript, [this](const QString& scriptName, bool userLoaded) { |
| 567 | loadScript(scriptName, userLoaded); | 567 | loadScript(scriptName, userLoaded); |
| 568 | }); | 568 | }); |
| 569 | connect(scriptEngine.data(), &ScriptEngine::reloadScript, [&](const QString& scriptName, bool userLoaded) { | 569 | connect(scriptEngine.data(), &ScriptEngine::reloadScript, [this](const QString& scriptName, bool userLoaded) { |
| 570 | loadScript(scriptName, userLoaded, false, false, true); | 570 | loadScript(scriptName, userLoaded, false, false, true); |
| 571 | }); | 571 | }); |
| 572 | 572 | ||