diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:03:25 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:03:25 +0200 |
| commit | 5f4fe2532feeb3a6e1e247e22b31f07a011a2539 (patch) | |
| tree | 5734318e955ce36593d0ad7682822b09d9c52d8a | |
| parent | 0d3cdf32fd44d4bf57f405cd255b211be06031e2 (diff) | |
| parent | 97f194cfabf9d8ab186241760a29bae1f4811184 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I494c2ac3ccc3b5673592d5775dd9990d7a0c2f58
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index abb04d5..fefb318 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1332,8 +1332,10 @@ void QScriptEnginePrivate::collectGarbage() void QScriptEnginePrivate::reportAdditionalMemoryCost(int size) { - if (size > 0) + if (size > 0) { + QScript::APIShim shim(this); globalData->heap.reportExtraMemoryCost(size); + } } QScript::TimeoutCheckerProxy *QScriptEnginePrivate::timeoutChecker() const |