History

Workaround crash in reportAdditionalMemoryCost other platforms

Anthony J. Thibault committed 7 years ago

Commit e1534b31 parent 154fd392 files · +6 −1Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−0
@@ -1346,7 +1346,10 @@ void ScriptEngine::callAnimationStateHandler(QScriptValue callback, AnimVariantM · 1345 unmodified lines
13461346
13471347 void ScriptEngine::updateMemoryCost(const qint64& deltaSize) {
13481348 if (deltaSize > 0) {
1349+ // We've patched qt to fix https://highfidelity.atlassian.net/browse/BUGZ-46 on mac and windows only.
1350+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
13491351 reportAdditionalMemoryCost(deltaSize);
1352+#endif
13501353 }
13511354 }
13521355