Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 4 files). Show all
Unified · Split
| @@ -863,7 +863,9 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 862 unmodified lines | |||
| 863 | QUrl thisURL { resolvePath(file) }; | 863 | QUrl thisURL { resolvePath(file) }; |
| 864 | if (!_includedURLs.contains(thisURL)) { | 864 | if (!_includedURLs.contains(thisURL)) { |
| 865 | urls.append(thisURL); | 865 | urls.append(thisURL); |
| 866 | } else { | 866 | _includedURLs << thisURL; |
| 867 | } | ||
| 868 | else { | ||
| 867 | qCDebug(scriptengine) << "Script.include() ignoring previously included url:" << thisURL; | 869 | qCDebug(scriptengine) << "Script.include() ignoring previously included url:" << thisURL; |
| 868 | } | 870 | } |
| 869 | } | 871 | } |
| @@ -876,7 +878,6 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 6 unmodified lines | |||
| 876 | if (contents.isNull()) { | 878 | if (contents.isNull()) { |
| 877 | qCDebug(scriptengine) << "Error loading file: " << url << "line:" << __LINE__; | 879 | qCDebug(scriptengine) << "Error loading file: " << url << "line:" << __LINE__; |
| 878 | } else { | 880 | } else { |
| 879 | _includedURLs << url; | ||
| 880 | QScriptValue result = evaluate(contents, url.toString()); | 881 | QScriptValue result = evaluate(contents, url.toString()); |
| 881 | } | 882 | } |
| 882 | } | 883 | } |