Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all
Unified · Split
| @@ -847,7 +847,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const { · 846 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 url; | |
| 850 | + return expandScriptUrl(normalizeScriptURL(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 = parentURL.resolved(url); | |
| 867 | + url = expandScriptUrl(normalizeScriptURL(parentURL.resolved(url))); | |
| 868 | 868 | return url; |
| 869 | 869 | } |
| 870 | 870 | |