Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 4 files). Show all
Unified · Split
| @@ -641,7 +641,7 @@ void ScriptEngine::stopTimer(QTimer *timer) { · 640 unmodified lines | |||
| 641 | } | 641 | } |
| 642 | } | 642 | } |
| 643 | 643 | ||
| 644 | QUrl ScriptEngine::resolveInclude(const QString& include) const { | 644 | QUrl ScriptEngine::resolvePath(const QString& include) const { |
| 645 | // first lets check to see if it's already a full URL | 645 | // first lets check to see if it's already a full URL |
| 646 | QUrl url(include); | 646 | QUrl url(include); |
| 647 | if (!url.scheme().isEmpty()) { | 647 | if (!url.scheme().isEmpty()) { |
| @@ -667,7 +667,7 @@ void ScriptEngine::print(const QString& message) { · 19 unmodified lines | |||
| 667 | } | 667 | } |
| 668 | 668 | ||
| 669 | void ScriptEngine::include(const QString& includeFile) { | 669 | void ScriptEngine::include(const QString& includeFile) { |
| 670 | QUrl url = resolveInclude(includeFile); | 670 | QUrl url = resolvePath(includeFile); |
| 671 | QString includeContents; | 671 | QString includeContents; |
| 672 | 672 | ||
| 673 | if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") { | 673 | if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") { |
| @@ -705,7 +705,7 @@ void ScriptEngine::include(const QString& includeFile) { · 31 unmodified lines | |||
| 705 | } | 705 | } |
| 706 | 706 | ||
| 707 | void ScriptEngine::load(const QString& loadFile) { | 707 | void ScriptEngine::load(const QString& loadFile) { |
| 708 | QUrl url = resolveInclude(loadFile); | 708 | QUrl url = resolvePath(loadFile); |
| 709 | emit loadScript(url.toString(), false); | 709 | emit loadScript(url.toString(), false); |
| 710 | } | 710 | } |
| 711 | 711 | ||