Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 1 file). Show all
Unified · Split
| @@ -397,7 +397,18 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL · 396 unmodified lines | |||
| 397 | Q_ARG(bool, reload)); | 397 | Q_ARG(bool, reload)); |
| 398 | return result; | 398 | return result; |
| 399 | } | 399 | } |
| 400 | QUrl scriptUrl = normalizeScriptURL(scriptFilename); | 400 | QUrl scriptUrl; |
| 401 | if (!scriptFilename.isValid() || | ||
| 402 | (scriptFilename.scheme() != "http" && | ||
| 403 | scriptFilename.scheme() != "https" && | ||
| 404 | scriptFilename.scheme() != "atp" && | ||
| 405 | scriptFilename.scheme() != "file")) { | ||
| 406 | // deal with a "url" like c:/something | ||
| 407 | scriptUrl = normalizeScriptURL(QUrl::fromLocalFile(scriptFilename.toString())); | ||
| 408 | } else { | ||
| 409 | scriptUrl = normalizeScriptURL(scriptFilename); | ||
| 410 | } | ||
| 411 | |||
| 401 | auto scriptEngine = getScriptEngine(scriptUrl.toString()); | 412 | auto scriptEngine = getScriptEngine(scriptUrl.toString()); |
| 402 | if (scriptEngine) { | 413 | if (scriptEngine) { |
| 403 | return scriptEngine; | 414 | return scriptEngine; |