Merge branch master into protocol_changes

HifiExperiments committed 2 years ago

Commit ee705d21 parent f9e729b370 files · +11827 −6045Browse files

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

Unified · Split

@@ -79,6 +79,7 @@ void registerMetaTypes(ScriptEngine* engine) { · 78 unmodified lines
79	79	scriptRegisterMetaType<QUrl, qURLToScriptValue, qURLFromScriptValue>(engine);
80	80	scriptRegisterMetaType<QColor, qColorToScriptValue, qColorFromScriptValue>(engine);
81	81	scriptRegisterMetaType<QTimer, qTimerToScriptValue, qTimerFromScriptValue>(engine, "QTimer");
	82	+ scriptRegisterMetaType<QByteArray, qBytearrayToScriptValue, qBytearrayFromScriptValue>(engine, "QByteArray");
82	83
83	84	scriptRegisterMetaType<PickRay, pickRayToScriptValue, pickRayFromScriptValue>(engine);
84	85	scriptRegisterMetaType<Collision, collisionToScriptValue, collisionFromScriptValue>(engine);