diff --git a/libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp b/libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp index 44f096598f..4caa5b8c9f 100644 --- a/libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp +++ b/libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp @@ -593,7 +593,7 @@ bool ScriptEngineV8::convertJSObjectToVariant(v8::Local object, QVar return false; } int length = names->Length(); - QHash properties; + QMap properties; for (int i = 0; i < length; i++) { v8::Local v8Property; QString name = *v8::String::Utf8Value(_v8Isolate, names->Get(context, i).ToLocalChecked()); diff --git a/libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp b/libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp index 67def9df35..95ceb67cb1 100644 --- a/libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp +++ b/libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp @@ -147,7 +147,7 @@ ScriptObjectV8Proxy* ScriptObjectV8Proxy::unwrapProxy(const V8ScriptValue& val) } v8::Local v8Object = v8::Local::Cast(v8Value); 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; } if (v8Object->GetAlignedPointerFromInternalField(0) != internalPointsToQObjectProxy) { diff --git a/libraries/shared/src/SettingHelpers.cpp b/libraries/shared/src/SettingHelpers.cpp index 7d059de5e7..4c7994c98f 100644 --- a/libraries/shared/src/SettingHelpers.cpp +++ b/libraries/shared/src/SettingHelpers.cpp @@ -133,12 +133,12 @@ QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map) { } switch (variantType) { - // V8TODO: why was this here? It seems that it supported - /*case QVariant::Hash: { + // QML has problems with QVariant::Hash + case QVariant::Hash: { qCritical() << "Unsupported variant type" << variant.typeName() << ";" << key << variant; Q_ASSERT(false); break; - }*/ + } case QVariant::Invalid: object.insert(key, QJsonValue()); @@ -150,7 +150,6 @@ QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map) { case QVariant::Bool: case QVariant::Double: case QVariant::Map: - case QVariant::Hash: case QVariant::List: object.insert(key, QJsonValue::fromVariant(variant)); break;