History

Merge remote-tracking branch 'upstream/master' into script-retry-improvements

humbletim committed 10 years ago

Commit 144983a2 parents 61452c2 e9194613 files · +5 −2Browse files

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

Unified · Split

libraries/script-engine/src/ScriptCache.cpp+3−0
@@ -229,6 +229,9 @@ void ScriptCache::scriptContentAvailable() { · 228 unmodified lines
229 });229 });
230 } else {230 } else {
231 // Dubious, but retained here because it matches the behavior before fixing the threading231 // Dubious, but retained here because it matches the behavior before fixing the threading
232
233 allCallbacks = scriptRequest.scriptUsers;
234
232 scriptContent = _scriptCache[url];235 scriptContent = _scriptCache[url];
233 finished = true;236 finished = true;
234 qCWarning(scriptengine) << "Error loading script from URL " << url;237 qCWarning(scriptengine) << "Error loading script from URL " << url;