Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 22:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ScriptEngine not properly resolving paths

Browse source
This commit is contained in:
Ryan Huffman 2016-09-26 15:37:51 -07:00
parent 32db63e177
commit 667a737018
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -25,6 +25,7 @@
#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>
#include <QtScript/QScriptContextInfo>
#include <QtScript/QScriptValue> #include <QtScript/QScriptValue>
#include <QtScript/QScriptValueIterator> #include <QtScript/QScriptValueIterator>
@ -1091,14 +1092,19 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
return expandScriptUrl(url); return expandScriptUrl(url);
} }
QScriptContextInfo contextInfo { currentContext()->parentContext() };
// we apparently weren't a fully qualified url, so, let's assume we're relative // we apparently weren't a fully qualified url, so, let's assume we're relative
// to the original URL of our script // to the original URL of our script
QUrl parentURL; QUrl parentURL = contextInfo.fileName();
if (parentURL.isEmpty()) {
if (_parentURL.isEmpty()) { if (_parentURL.isEmpty()) {
parentURL = QUrl(_fileNameString); parentURL = QUrl(_fileNameString);
} else { } else {
parentURL = QUrl(_parentURL); parentURL = QUrl(_parentURL);
} }
}
// if the parent URL's scheme is empty, then this is probably a local file... // if the parent URL's scheme is empty, then this is probably a local file...
if (parentURL.scheme().isEmpty()) { if (parentURL.scheme().isEmpty()) {
parentURL = QUrl::fromLocalFile(_fileNameString); parentURL = QUrl::fromLocalFile(_fileNameString);