History

fix script load from disk on windows

Seth Alves committed 10 years ago

Commit 651d2c81 parent 14934671 file · +12 −1Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+12−1
@@ -397,7 +397,18 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL · 396 unmodified lines
397397 Q_ARG(bool, reload));
398398 return result;
399399 }
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+
401412 auto scriptEngine = getScriptEngine(scriptUrl.toString());
402413 if (scriptEngine) {
403414 return scriptEngine;