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/ArrayBufferClass.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ArrayBufferClass.cpp+3−1
@@ -76,8 +76,10 @@ QScriptValue ArrayBufferClass::newInstance(qint32 size) { · 75 unmodified lines
7676 engine()->evaluate("throw \"ArgumentError: absurd length\"");
7777 return QScriptValue();
7878 }
79−
79+ // We've patched qt to fix https://highfidelity.atlassian.net/browse/BUGZ-46 on mac and windows only.
80+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
8081 engine()->reportAdditionalMemoryCost(size);
82+#endif
8183 QScriptEngine* eng = engine();
8284 QVariant variant = QVariant::fromValue(QByteArray(size, 0));
8385 QScriptValue data = eng->newVariant(variant);