Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all
Unified · Split
| @@ -1365,12 +1365,12 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 1364 unmodified lines | ||
| 1365 | 1365 | doWithEnvironment(capturedEntityIdentifier, capturedSandboxURL, operation); |
| 1366 | 1366 | if (tryCatch.hasPending()) { |
| 1367 | 1367 | // match previous include behavior where possible by logging, not propagating, exceptions. |
| 1368 | − // for nested evaluations, exceptions are now allowed to propagate | |
| 1369 | 1368 | auto err = tryCatch.pending(); |
| 1370 | 1369 | emit unhandledException(err); |
| 1371 | − if (tryCatch.wouldEmit()) { | |
| 1372 | − tryCatch.consume(); | |
| 1373 | − } | |
| 1370 | + // FIXME: to be revisited with next PR 21114-part3 for compat with require/module | |
| 1371 | + //if (tryCatch.wouldEmit()) { | |
| 1372 | + tryCatch.consume(); | |
| 1373 | + //} | |
| 1374 | 1374 | } |
| 1375 | 1375 | } else { |
| 1376 | 1376 | scriptWarningMessage("Script.include() skipping evaluation of previously included url:" + url.toString()); |