Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all
Unified · Split
| @@ -1187,6 +1187,8 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 1186 unmodified lines | |||
| 1187 | thisURL = resolvePath(file); | 1187 | thisURL = resolvePath(file); |
| 1188 | } | 1188 | } |
| 1189 | 1189 | ||
| 1190 | thisURL = expandScriptUrl(normalizeScriptURL(ResourceManager::normalizeURL(thisURL))); | ||
| 1191 | |||
| 1190 | if (!_includedURLs.contains(thisURL)) { | 1192 | if (!_includedURLs.contains(thisURL)) { |
| 1191 | if (!isStandardLibrary && !currentSandboxURL.isEmpty() && (thisURL.scheme() == "file") && | 1193 | if (!isStandardLibrary && !currentSandboxURL.isEmpty() && (thisURL.scheme() == "file") && |
| 1192 | (currentSandboxURL.scheme() != "file" || | 1194 | (currentSandboxURL.scheme() != "file" || |