Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 7 insertions, 7 deletions

diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp
index 45bb535..5c281bb 100644
--- a/src/declarative/qml/qmlworkerscript.cpp
+++ b/src/declarative/qml/qmlworkerscript.cpp
@@ -277,7 +277,7 @@ QVariant QmlWorkerScriptEnginePrivate::scriptValueToVariant(const QScriptValue &
     } else if (value.isArray()) {
         QVariantList list;
 
-        quint32 length = (quint32)value.property("length").toNumber();
+        quint32 length = (quint32)value.property(QLatin1String("length")).toNumber();
 
         for (quint32 ii = 0; ii < length; ++ii) {
             QVariant v = scriptValueToVariant(ii);
@@ -304,21 +304,21 @@ QVariant QmlWorkerScriptEnginePrivate::scriptValueToVariant(const QScriptValue &
 
 QScriptValue QmlWorkerScriptEnginePrivate::variantToScriptValue(const QVariant &value, QScriptEngine *engine)
 {
-    if (value.type() == QVariant::Bool) {
+    if (value.userType() == QVariant::Bool) {
         return QScriptValue(value.toBool());
-    } else if (value.type() == QVariant::String) {
+    } else if (value.userType() == QVariant::String) {
         return QScriptValue(value.toString());
-    } else if (value.type() == (QVariant::Type)QMetaType::QReal) {
+    } else if (value.userType() == QMetaType::QReal) {
         return QScriptValue(value.toReal());
-    } else if (value.type() == (QVariant::Type)QMetaType::QVariantList) {
+    } else if (value.userType() == QMetaType::QVariantList) {
         QVariantList list = qvariant_cast<QVariantList>(value);
         QScriptValue rv = engine->newArray(list.count());
 
-        for (quint32 ii = 0; ii < list.count(); ++ii) 
+        for (quint32 ii = 0; ii < quint32(list.count()); ++ii) 
             rv.setProperty(ii, variantToScriptValue(list.at(ii), engine));
 
         return rv;
-    } else if (value.type() == (QVariant::Type)QMetaType::QVariantHash) {
+    } else if (value.userType() == QMetaType::QVariantHash) {
 
         QVariantHash hash = qvariant_cast<QVariantHash>(value);