diff options
author | Paul Lemire <paul.lemire.ecortex@kdab.com> | 2014-12-05 07:59:37 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-12-12 14:17:43 +0100 |
commit | d587ca0884efebf31b807edbd55a120b97dc7bcc (patch) | |
tree | eba76b4abb56509b50c0fa1bd801db44e37656fb /src/quick3d/quick3drenderer | |
parent | 4a78486d55cdfb6919c4c954090d995a2ca51425 (diff) |
Quick3DParameter: Use QJSValue to QVariantList converter
Change-Id: I934b64ece9623a99486df33bb11ce1ad4a68a201
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer')
-rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dparameter.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp b/src/quick3d/quick3drenderer/items/quick3dparameter.cpp index 229af3e45..bcea33bdd 100644 --- a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dparameter.cpp @@ -68,16 +68,8 @@ void Quick3DParameterPrivate::setValue(const QVariant &value) { if (value.userType() == qjsValueTypeId) { QJSValue v = value.value<QJSValue>(); - if (v.isArray()) { - QJSValueIterator it(v); - QVariantList values; - while (it.hasNext()) { - it.next(); - if (it.hasNext()) // The last element in an Array is the count, which we don't want - values << it.value().toVariant(); - } - QParameterPrivate::setValue(values); - } + if (v.isArray()) + QParameterPrivate::setValue(value.value<QVariantList>()); } else { QParameterPrivate::setValue(value); } |