Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 4 files). Show all
Unified · Split
| @@ -220,7 +220,7 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { · 219 unmodified lines | ||
| 220 | 220 | return; |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | − QUrl url = expandScriptUrl(normalizeScriptURL(scriptURL)); | |
| 223 | + QUrl url = expandScriptUrl(scriptURL); | |
| 224 | 224 | _fileNameString = url.toString(); |
| 225 | 225 | _isReloading = reload; |
| 226 | 226 | |
| @@ -847,7 +847,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const { · 620 unmodified lines | ||
| 847 | 847 | QUrl url(include); |
| 848 | 848 | // first lets check to see if it's already a full URL |
| 849 | 849 | if (!url.scheme().isEmpty()) { |
| 850 | − return expandScriptUrl(normalizeScriptURL(url)); | |
| 850 | + return expandScriptUrl(url); | |
| 851 | 851 | } |
| 852 | 852 | |
| 853 | 853 | // we apparently weren't a fully qualified url, so, let's assume we're relative |
| @@ -864,7 +864,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const { · 10 unmodified lines | ||
| 864 | 864 | } |
| 865 | 865 | |
| 866 | 866 | // at this point we should have a legitimate fully qualified URL for our parent |
| 867 | − url = expandScriptUrl(normalizeScriptURL(parentURL.resolved(url))); | |
| 867 | + url = expandScriptUrl(parentURL.resolved(url)); | |
| 868 | 868 | return url; |
| 869 | 869 | } |
| 870 | 870 | |