History

Adding more libs, ifdefs for android incompatible code

Bradley Austin Davis committed 8 years ago

Commit 9df9cf71 parent 0379eba33 files · +407 −104Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 33 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−3
@@ -1607,14 +1607,14 @@ QVariantMap ScriptEngine::fetchModuleSource(const QString& modulePath, const boo · 1606 unmodified lines
16071607 if (!loader->isFinished()) {
16081608 QTimer monitor;
16091609 QEventLoop loop;
1610− QObject::connect(loader, &BatchLoader::finished, this, [this, &monitor, &loop]{
1610+ QObject::connect(loader, &BatchLoader::finished, this, [&monitor, &loop]{
16111611 monitor.stop();
16121612 loop.quit();
16131613 });
16141614
16151615 // this helps detect the case where stop() is invoked during the download
16161616 // but not seen in time to abort processing in onload()...
1617− connect(&monitor, &QTimer::timeout, this, [this, &loop, &loader]{
1617+ connect(&monitor, &QTimer::timeout, this, [this, &loop]{
16181618 if (isStopping()) {
16191619 loop.exit(-1);
16201620 }
@@ -2247,7 +2247,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 626 unmodified lines
22472247 QTimer timeout;
22482248 timeout.setSingleShot(true);
22492249 timeout.start(SANDBOX_TIMEOUT);
2250− connect(&timeout, &QTimer::timeout, [&sandbox, SANDBOX_TIMEOUT, scriptOrURL]{
2250+ connect(&timeout, &QTimer::timeout, [&sandbox, scriptOrURL]{
22512251 qCDebug(scriptengine) << "ScriptEngine::entityScriptContentAvailable timeout(" << scriptOrURL << ")";
22522252
22532253 // Guard against infinite loops and non-performant code