History

OK this is definitely working

Zach Fox committed 7 years ago

Commit 5067fd41 parent 21454f6310 files · +0 −34894Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+1−1
@@ -114,7 +114,7 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) { · 113 unmodified lines
114 url = QUrl::fromLocalFile(fileInfo.canonicalFilePath());114 url = QUrl::fromLocalFile(fileInfo.canonicalFilePath());
115 115
116 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();116 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
117 if (!defaultScriptsLoc.isParentOf(url) && defaultScriptsLoc != url) {117 if (!defaultScriptsLoc.isParentOf(url) /*&& defaultScriptsLoc != url*/) {
118 qCWarning(scriptengine) << "Script.include() ignoring file path"118 qCWarning(scriptengine) << "Script.include() ignoring file path"
119 << "-- outside of standard libraries: "119 << "-- outside of standard libraries: "
120 << url.path()120 << url.path()