Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 4 files). Show all
Unified · Split
| @@ -618,16 +618,20 @@ void ScriptEngine::stopTimer(QTimer *timer) { · 617 unmodified lines | ||
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | QUrl ScriptEngine::resolvePath(const QString& include) const { |
| 621 | − // first lets check to see if it's already a full URL | |
| 622 | 621 | QUrl url(include); |
| 622 | + // first lets check to see if it's already a full URL | |
| 623 | 623 | if (!url.scheme().isEmpty()) { |
| 624 | 624 | return url; |
| 625 | 625 | } |
| 626 | 626 | |
| 627 | 627 | // we apparently weren't a fully qualified url, so, let's assume we're relative |
| 628 | 628 | // to the original URL of our script |
| 629 | − QUrl parentURL(_fileNameString); | |
| 630 | − | |
| 629 | + QUrl parentURL; | |
| 630 | + if (_parentURL.isEmpty()) { | |
| 631 | + parentURL = QUrl(_fileNameString); | |
| 632 | + } else { | |
| 633 | + parentURL = QUrl(_parentURL); | |
| 634 | + } | |
| 631 | 635 | // if the parent URL's scheme is empty, then this is probably a local file... |
| 632 | 636 | if (parentURL.scheme().isEmpty()) { |
| 633 | 637 | parentURL = QUrl::fromLocalFile(_fileNameString); |
| @@ -660,6 +664,7 @@ void ScriptEngine::include(const QString& includeFile) { · 26 unmodified lines | ||
| 660 | 664 | #else |
| 661 | 665 | QString fileName = url.toLocalFile(); |
| 662 | 666 | #endif |
| 667 | + | |
| 663 | 668 | QFile scriptFile(fileName); |
| 664 | 669 | if (scriptFile.open(QFile::ReadOnly | QFile::Text)) { |
| 665 | 670 | qDebug() << "Including file:" << fileName; |