diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-17 03:39:45 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-17 03:39:45 (GMT) |
| commit | 9f12ede32d9eaadde7b1f72cf2191f39d5780d57 (patch) | |
| tree | 96bbdc9d95c9cd9e087ab2f7c0d19e18e28a1e4a /src/declarative/qml/qmlmetaproperty.cpp | |
| parent | b4754aa9a3761c1bcd8519280d98e34371f4ff10 (diff) | |
| download | Qt-9f12ede32d9eaadde7b1f72cf2191f39d5780d57.zip Qt-9f12ede32d9eaadde7b1f72cf2191f39d5780d57.tar.gz Qt-9f12ede32d9eaadde7b1f72cf2191f39d5780d57.tar.bz2 | |
Revert "Replace QList<>* support with QmlListProperty"
This was accidentally pushed early.
This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
Diffstat (limited to 'src/declarative/qml/qmlmetaproperty.cpp')
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index fc11bd6..70f9ad3 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -889,8 +889,7 @@ bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data QVariant listVar = prop.read(object); QmlMetaType::clear(listVar); for (int ii = 0; ii < list.count(); ++ii) { - QObject *o = list.at(ii); - QVariant v = QVariant(listType, &o); + QVariant v = QmlMetaType::qmlType(listType)->fromObject(list.at(ii)); QmlMetaType::append(listVar, v); } |