mirror of
https://github.com/overte-org/overte.git
synced 2025-04-26 06:16:24 +02:00
154fd393ba
This fix requires a patch to qt. This build includs a new pre-built Qt 5.12.3 with the patch applied. See tools/qt5-builder/qtscript-crash-fix.patch to see actual patch applied. * Touched bullet3 portfile to create new vckpg hash * New urls for qt assets which include qscript patch hifi_vcpkg.py * Updated tools/qt5-builder/ with qscript patch and README.md directions. https://highfidelity.atlassian.net/browse/BUGZ-46 A qt bug was filed to hopefully get this bug fixed upstream. https://bugreports.qt.io/browse/QTBUG-76176
16 lines
583 B
Diff
16 lines
583 B
Diff
diff --git a/qtscript/src/script/api/qscriptengine.cpp b/qtscript/src/script/api/qscriptengine.cpp
|
|
index c5f437b..942833e 100644
|
|
--- a/qtscript/src/script/api/qscriptengine.cpp
|
|
+++ b/qtscript/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
|