Use variant instead of var in QML

In QML "var"s are not the same as JavaScript vars - they are QVariants
instead.  However, as they behave in a similar enough fashion to native
JavaScript it can be confusing to developers when they are called "var".

1 files changed, 1 insertions, 6 deletions

diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index ec84da9..4601aaa 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -361,12 +361,7 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
         else
             v = enginePriv->scriptValueToVariant(value, lastData->propType);
 
-        if (!value.isVariant() && v.userType() == QMetaType::QVariantList &&
-            lastData->propType == qMetaTypeId<QVariant>()) {
-
-            QString error = QLatin1String("Cannot assign JavaScript array to QML variant property");
-            context->throwError(error);
-        } else if (!QDeclarativePropertyPrivate::write(obj, *lastData, v, evalContext)) {
+        if (!QDeclarativePropertyPrivate::write(obj, *lastData, v, evalContext)) {
             const char *valueType = 0;
             if (v.userType() == QVariant::Invalid) valueType = "null";
             else valueType = QMetaType::typeName(v.userType());