diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-09 21:39:42 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-09 21:39:42 (GMT) |
| commit | 4adf3144d79cf3affe2b83dabf5333134b6ec6f7 (patch) | |
| tree | e6b0a817300eb4a195ee92e5c6c6a19ed4a36f60 /src/declarative/qml/qmlobjectscriptclass.cpp | |
| parent | 9a3b5988a089429e016334a434023bc5c992f0ed (diff) | |
| parent | 969b61f508294d1f683e09e78641127d0f0def05 (diff) | |
| download | Qt-4adf3144d79cf3affe2b83dabf5333134b6ec6f7.zip Qt-4adf3144d79cf3affe2b83dabf5333134b6ec6f7.tar.gz Qt-4adf3144d79cf3affe2b83dabf5333134b6ec6f7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/qml/qmlobjectscriptclass.cpp')
| -rw-r--r-- | src/declarative/qml/qmlobjectscriptclass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp index 7bbb7df..09d326f 100644 --- a/src/declarative/qml/qmlobjectscriptclass.cpp +++ b/src/declarative/qml/qmlobjectscriptclass.cpp @@ -238,7 +238,7 @@ QmlObjectScriptClass::property(QObject *obj, const Identifier &name) } if (lastData->flags & QmlPropertyCache::Data::IsQList) { - return Value(scriptEngine, enginePriv->listClass->newList(obj, lastData->coreIndex, QmlListScriptClass::QListPtr, lastData->propType)); + return Value(scriptEngine, enginePriv->listClass->newList(obj, lastData->coreIndex, QmlListScriptClass::ListProperty, lastData->propType)); } else if (lastData->flags & QmlPropertyCache::Data::IsQmlList) { return Value(scriptEngine, enginePriv->listClass->newList(obj, lastData->coreIndex, QmlListScriptClass::QmlListPtr, lastData->propType)); } else if (lastData->flags & QmlPropertyCache::Data::IsQObjectDerived) { |