History

make ResourceManager be owned by DependencyManager

Seth Alves committed 9 years ago

Commit 794495c1 parent 561786023 files · +68 −65Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−1
@@ -1762,7 +1762,7 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 1761 unmodified lines
1762 QList<QUrl> urls;1762 QList<QUrl> urls;
1763 1763
1764 for (QString includeFile : includeFiles) {1764 for (QString includeFile : includeFiles) {
1765 QString file = ResourceManager::normalizeURL(includeFile);1765 QString file = DependencyManager::get<ResourceManager>()->normalizeURL(includeFile);
1766 QUrl thisURL;1766 QUrl thisURL;
1767 bool isStandardLibrary = false;1767 bool isStandardLibrary = false;
1768 if (file.startsWith("/~/")) {1768 if (file.startsWith("/~/")) {