diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-15 04:22:43 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-15 04:22:43 (GMT) |
commit | c5be2898cac41cf18ab14c3ee42d4d8c879c3e55 (patch) | |
tree | 962215b6af2d8908a8f0f33d4f127cebd02d8adf /src/declarative/qml/qmllistscriptclass.cpp | |
parent | bd3caa48edf2cd53e561cec7ee7ccec6748a4843 (diff) | |
download | Qt-c5be2898cac41cf18ab14c3ee42d4d8c879c3e55.zip Qt-c5be2898cac41cf18ab14c3ee42d4d8c879c3e55.tar.gz Qt-c5be2898cac41cf18ab14c3ee42d4d8c879c3e55.tar.bz2 |
Update QML following bd3caa48edf2cd53e561cec7ee7ccec6748a4843
Diffstat (limited to 'src/declarative/qml/qmllistscriptclass.cpp')
-rw-r--r-- | src/declarative/qml/qmllistscriptclass.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp index b275625..4b8b056 100644 --- a/src/declarative/qml/qmllistscriptclass.cpp +++ b/src/declarative/qml/qmllistscriptclass.cpp @@ -107,7 +107,7 @@ QmlListScriptClass::Value QmlListScriptClass::property(Object *obj, const Identi ListData *data = (ListData *)obj; if (!data->object) - return scriptEngine->undefinedValue(); + return Value(); void *list = 0; void *args[] = { &list, 0 }; @@ -115,7 +115,7 @@ QmlListScriptClass::Value QmlListScriptClass::property(Object *obj, const Identi data->propertyIdx, args); if (!list) - return scriptEngine->undefinedValue(); + return Value(); if (data->type == QListPtr) { const QList<QObject *> &qlist = *((QList<QObject *>*)list); @@ -125,9 +125,9 @@ QmlListScriptClass::Value QmlListScriptClass::property(Object *obj, const Identi if (name == m_lengthId.identifier) return Value(scriptEngine, count); else if (lastIndex < count) - return enginePriv->objectClass->newQObject(qlist.at(lastIndex)); + return Value(scriptEngine, enginePriv->objectClass->newQObject(qlist.at(lastIndex))); else - return scriptEngine->undefinedValue(); + return Value(); } else { Q_ASSERT(data->type == QmlListPtr); @@ -138,9 +138,9 @@ QmlListScriptClass::Value QmlListScriptClass::property(Object *obj, const Identi if (name == m_lengthId.identifier) return Value(scriptEngine, count); else if (lastIndex < count) - return enginePriv->objectClass->newQObject(qmllist.at(lastIndex)); + return Value(scriptEngine, enginePriv->objectClass->newQObject(qmllist.at(lastIndex))); else - return scriptEngine->undefinedValue(); + return Value(); } } |