diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-12-06 23:52:22 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-12-06 23:52:22 (GMT) |
commit | ff30a79b70ffd14104aa5a770bb67efb45da12dd (patch) | |
tree | 18a776b4271559a9493f1f7c6452e341290dcaac /src/declarative/qml/qmlworkerscript.cpp | |
parent | f3a55136c0375d358e93929e94c2ab6c15dbfb93 (diff) | |
parent | b1695545a5d57028910b88b4a75b82b86aa0f009 (diff) | |
download | Qt-ff30a79b70ffd14104aa5a770bb67efb45da12dd.zip Qt-ff30a79b70ffd14104aa5a770bb67efb45da12dd.tar.gz Qt-ff30a79b70ffd14104aa5a770bb67efb45da12dd.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlworkerscript.cpp')
-rw-r--r-- | src/declarative/qml/qmlworkerscript.cpp | 14 |
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); |