Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript_cast.cpp (1 of 35 files). Show all
Unified · Split
| @@ -186,13 +186,13 @@ static bool JsonArrayFromScriptValue(const ScriptValue& src, QJsonArray& dest) { · 185 unmodified lines | |||
| 186 | void ScriptEngineQtScript::registerSystemTypes() { | 186 | void ScriptEngineQtScript::registerSystemTypes() { |
| 187 | qScriptRegisterMetaType(this, ScriptValueToQScriptValue, ScriptValueFromQScriptValue); | 187 | qScriptRegisterMetaType(this, ScriptValueToQScriptValue, ScriptValueFromQScriptValue); |
| 188 | 188 | ||
| 189 | scriptRegisterMetaType(this, StringListToScriptValue, StringListFromScriptValue); | 189 | scriptRegisterMetaType<QStringList, StringListToScriptValue, StringListFromScriptValue>(this); |
| 190 | scriptRegisterMetaType(this, VariantListToScriptValue, VariantListFromScriptValue); | 190 | scriptRegisterMetaType<QVariantList, VariantListToScriptValue, VariantListFromScriptValue>(this); |
| 191 | scriptRegisterMetaType(this, VariantMapToScriptValue, VariantMapFromScriptValue); | 191 | scriptRegisterMetaType<QVariantMap, VariantMapToScriptValue, VariantMapFromScriptValue>(this); |
| 192 | scriptRegisterMetaType(this, VariantHashToScriptValue, VariantHashFromScriptValue); | 192 | scriptRegisterMetaType<QVariantHash, VariantHashToScriptValue, VariantHashFromScriptValue>(this); |
| 193 | scriptRegisterMetaType(this, JsonValueToScriptValue, JsonValueFromScriptValue); | 193 | scriptRegisterMetaType<QJsonValue, JsonValueToScriptValue, JsonValueFromScriptValue>(this); |
| 194 | scriptRegisterMetaType(this, JsonObjectToScriptValue, JsonObjectFromScriptValue); | 194 | scriptRegisterMetaType<QJsonObject, JsonObjectToScriptValue, JsonObjectFromScriptValue>(this); |
| 195 | scriptRegisterMetaType(this, JsonArrayToScriptValue, JsonArrayFromScriptValue); | 195 | scriptRegisterMetaType<QJsonArray, JsonArrayToScriptValue, JsonArrayFromScriptValue>(this); |
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | bool ScriptEngineQtScript::castValueToVariant(const QScriptValue& val, QVariant& dest, int destTypeId) { | 198 | bool ScriptEngineQtScript::castValueToVariant(const QScriptValue& val, QVariant& dest, int destTypeId) { |