History

Merge pull request #10792 from jherico/qml_crashes

Trying to fix QtQml/QtScript crashes

Brad Hefta-Gaub committed 9 years ago

Commit dc649e82 parents 63279f4 341646c47 files · +665 −461Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+0−3
@@ -16,8 +16,6 @@ · 15 unmodified lines
16#include <UserActivityLogger.h>16#include <UserActivityLogger.h>
17#include <PathUtils.h>17#include <PathUtils.h>
18 18
19#include <OffscreenUi.h>
20
21#include "ScriptEngine.h"19#include "ScriptEngine.h"
22#include "ScriptEngineLogging.h"20#include "ScriptEngineLogging.h"
23 21
@@ -446,7 +444,6 @@ void ScriptEngines::setScriptsLocation(const QString& scriptsLocation) { · 422 unmodified lines
446void ScriptEngines::reloadAllScripts() {444void ScriptEngines::reloadAllScripts() {
447 qCDebug(scriptengine) << "reloadAllScripts -- clearing caches";445 qCDebug(scriptengine) << "reloadAllScripts -- clearing caches";
448 DependencyManager::get<ScriptCache>()->clearCache();446 DependencyManager::get<ScriptCache>()->clearCache();
449 DependencyManager::get<OffscreenUi>()->clearCache();
450 qCDebug(scriptengine) << "reloadAllScripts -- stopping all scripts";447 qCDebug(scriptengine) << "reloadAllScripts -- stopping all scripts";
451 stopAllScripts(true);448 stopAllScripts(true);
452}449}