diff options
| author | Qt Forward Merge Bot <[email protected]> | 2019-04-27 01:00:40 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <[email protected]> | 2019-04-27 01:00:40 +0200 |
| commit | 332e514fb4954fde9af03e1699c066cbbdb0420d (patch) | |
| tree | ebb9b830d7679521d3ba40ddff81f1d15447cfac /src/qml/jsruntime/qv4engine.cpp | |
| parent | 64a6677ae612f0af01cbec0b8b2a2dd625bcf85b (diff) | |
| parent | 8a5001247b250a7f7cb938743481b1405dcdc3a0 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I552629813ea8100d04ea19e51fe7198931082e19
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 4c5e124cb0..8057119064 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -172,7 +172,7 @@ ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine) bool ok = false; maxCallDepth = qEnvironmentVariableIntValue("QV4_MAX_CALL_DEPTH", &ok); if (!ok || maxCallDepth <= 0) { -#ifdef QT_NO_DEBUG +#if defined(QT_NO_DEBUG) && !defined(__SANITIZE_ADDRESS__) maxCallDepth = 1234; #else // no (tail call) optimization is done, so there'll be a lot mare stack frames active |