diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index b6cbb69..8f723f8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.14.0 +MODULE_VERSION = 5.15.0 diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 5bd399f..ec5e1ff 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 diff --git a/tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js b/tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js index d9d8bc6..364baf6 100644 --- a/tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js +++ b/tests/auto/qscriptjstestsuite/tests/ecma/String/15.5.4.12-3.js @@ -68,7 +68,7 @@ writeHeaderToLog( SECTION + " "+ TITLE); // Georgian // Range: U+10A0 to U+10FF -for ( var i = 0x10A0; i <= 0x10FF; i++ ) { +for ( var i = 0x10A0; i <= 0x10CF; i++ ) { // 0x10FB and 0x10FC also work var U = new Unicode( i ); /* new TestCase( SECTION, |