mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 05:37:17 +02:00
Fixed convertJSObjectToVariant
This commit is contained in:
parent
539c2812c3
commit
a7b1fdcae6
3 changed files with 5 additions and 6 deletions
|
@ -593,7 +593,7 @@ bool ScriptEngineV8::convertJSObjectToVariant(v8::Local<v8::Object> object, QVar
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
int length = names->Length();
|
int length = names->Length();
|
||||||
QHash<QString, QVariant> properties;
|
QMap<QString, QVariant> properties;
|
||||||
for (int i = 0; i < length; i++) {
|
for (int i = 0; i < length; i++) {
|
||||||
v8::Local<v8::Value> v8Property;
|
v8::Local<v8::Value> v8Property;
|
||||||
QString name = *v8::String::Utf8Value(_v8Isolate, names->Get(context, i).ToLocalChecked());
|
QString name = *v8::String::Utf8Value(_v8Isolate, names->Get(context, i).ToLocalChecked());
|
||||||
|
|
|
@ -147,7 +147,7 @@ ScriptObjectV8Proxy* ScriptObjectV8Proxy::unwrapProxy(const V8ScriptValue& val)
|
||||||
}
|
}
|
||||||
v8::Local<v8::Object> v8Object = v8::Local<v8::Object>::Cast(v8Value);
|
v8::Local<v8::Object> v8Object = v8::Local<v8::Object>::Cast(v8Value);
|
||||||
if (v8Object->InternalFieldCount() != 3) {
|
if (v8Object->InternalFieldCount() != 3) {
|
||||||
qDebug(scriptengine) << "Cannot unwrap proxy - wrong number of internal fields";
|
//qDebug(scriptengine) << "Cannot unwrap proxy - wrong number of internal fields";
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
if (v8Object->GetAlignedPointerFromInternalField(0) != internalPointsToQObjectProxy) {
|
if (v8Object->GetAlignedPointerFromInternalField(0) != internalPointsToQObjectProxy) {
|
||||||
|
|
|
@ -133,12 +133,12 @@ QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map) {
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (variantType) {
|
switch (variantType) {
|
||||||
// V8TODO: why was this here? It seems that it supported
|
// QML has problems with QVariant::Hash
|
||||||
/*case QVariant::Hash: {
|
case QVariant::Hash: {
|
||||||
qCritical() << "Unsupported variant type" << variant.typeName() << ";" << key << variant;
|
qCritical() << "Unsupported variant type" << variant.typeName() << ";" << key << variant;
|
||||||
Q_ASSERT(false);
|
Q_ASSERT(false);
|
||||||
break;
|
break;
|
||||||
}*/
|
}
|
||||||
|
|
||||||
case QVariant::Invalid:
|
case QVariant::Invalid:
|
||||||
object.insert(key, QJsonValue());
|
object.insert(key, QJsonValue());
|
||||||
|
@ -150,7 +150,6 @@ QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map) {
|
||||||
case QVariant::Bool:
|
case QVariant::Bool:
|
||||||
case QVariant::Double:
|
case QVariant::Double:
|
||||||
case QVariant::Map:
|
case QVariant::Map:
|
||||||
case QVariant::Hash:
|
|
||||||
case QVariant::List:
|
case QVariant::List:
|
||||||
object.insert(key, QJsonValue::fromVariant(variant));
|
object.insert(key, QJsonValue::fromVariant(variant));
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue