History

revert f9747d8a (rawURL) + apply alternative approach for aligning batch-loaded script URLs

humbletim committed 10 years ago

Commit d749f241 parent f9747d82 files · +6 −3Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−0
@@ -1187,6 +1187,8 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 1186 unmodified lines
11871187 thisURL = resolvePath(file);
11881188 }
11891189
1190+ thisURL = expandScriptUrl(normalizeScriptURL(ResourceManager::normalizeURL(thisURL)));
1191+
11901192 if (!_includedURLs.contains(thisURL)) {
11911193 if (!isStandardLibrary && !currentSandboxURL.isEmpty() && (thisURL.scheme() == "file") &&
11921194 (currentSandboxURL.scheme() != "file" ||