diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-29 07:48:59 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-04-29 08:34:50 +0000 |
| commit | 9c25df6dd0412d0e4211370843d8cbb8aef1e512 (patch) | |
| tree | 61919135b33113cf94753608b221758f95a8ce77 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 0ca32eb4c57ba43b64cfc74c0fbd1c63706952c2 (diff) | |
| parent | 23f988fe48f3f3c63e8311c31ed09394702089d2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
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 b9130aa7f8..f374a092b7 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -175,7 +175,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 |