diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 01:01:00 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 01:01:00 +0100 |
| commit | 24dfffe33b22c07adfbc4bbaf8ca6048808cb145 (patch) | |
| tree | ae90325d0acdb7ad2d55d3eaf7ccd8f76cb3c83a /src/qml/jsruntime/qv4engine.cpp | |
| parent | 0ae32e678eedf7450a0d7291bfb27925874de462 (diff) | |
| parent | e56df5d505b92de46840d24e84650f92c7c24431 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ic5a0c02ab45aac18c218dbeb8cd4b4cd3b609eb6
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 2377b7dc38..ff7bcb63fa 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -342,7 +342,7 @@ ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine) jsObjects[BooleanProto] = memoryManager->allocate<BooleanPrototype>(); jsObjects[DateProto] = memoryManager->allocate<DatePrototype>(); -#ifdef QT_NO_DEBUG +#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) InternalClassEntry *index = nullptr; #else InternalClassEntry _index; |