Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 107 files). Show all
Unified · Split
| @@ -601,16 +601,20 @@ void ScriptEngine::stopTimer(QTimer *timer) { · 600 unmodified lines | |||
| 601 | } | 601 | } |
| 602 | 602 | ||
| 603 | QUrl ScriptEngine::resolvePath(const QString& include) const { | 603 | QUrl ScriptEngine::resolvePath(const QString& include) const { |
| 604 | // first lets check to see if it's already a full URL | ||
| 605 | QUrl url(include); | 604 | QUrl url(include); |
| 605 | // first lets check to see if it's already a full URL | ||
| 606 | if (!url.scheme().isEmpty()) { | 606 | if (!url.scheme().isEmpty()) { |
| 607 | return url; | 607 | return url; |
| 608 | } | 608 | } |
| 609 | 609 | ||
| 610 | // we apparently weren't a fully qualified url, so, let's assume we're relative | 610 | // we apparently weren't a fully qualified url, so, let's assume we're relative |
| 611 | // to the original URL of our script | 611 | // to the original URL of our script |
| 612 | QUrl parentURL(_fileNameString); | 612 | QUrl parentURL; |
| 613 | 613 | if (_parentURL.isEmpty()) { | |
| 614 | parentURL = QUrl(_fileNameString); | ||
| 615 | } else { | ||
| 616 | parentURL = QUrl(_parentURL); | ||
| 617 | } | ||
| 614 | // if the parent URL's scheme is empty, then this is probably a local file... | 618 | // if the parent URL's scheme is empty, then this is probably a local file... |
| 615 | if (parentURL.scheme().isEmpty()) { | 619 | if (parentURL.scheme().isEmpty()) { |
| 616 | parentURL = QUrl::fromLocalFile(_fileNameString); | 620 | parentURL = QUrl::fromLocalFile(_fileNameString); |
| @@ -643,6 +647,7 @@ void ScriptEngine::include(const QString& includeFile) { · 26 unmodified lines | |||
| 643 | #else | 647 | #else |
| 644 | QString fileName = url.toLocalFile(); | 648 | QString fileName = url.toLocalFile(); |
| 645 | #endif | 649 | #endif |
| 650 | |||
| 646 | QFile scriptFile(fileName); | 651 | QFile scriptFile(fileName); |
| 647 | if (scriptFile.open(QFile::ReadOnly | QFile::Text)) { | 652 | if (scriptFile.open(QFile::ReadOnly | QFile::Text)) { |
| 648 | qDebug() << "Including file:" << fileName; | 653 | qDebug() << "Including file:" << fileName; |