diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-13 03:19:35 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-13 03:19:35 (GMT) |
| commit | 6c19bdb8552f3cc6ced2a20868f1f1952f94a69c (patch) | |
| tree | a5c359f8c7d02c8bafb8469c16af5b18f4d0595f /src/declarative/util | |
| parent | 01fbf55727678509f87523ef2ddda1d21d4ac2ab (diff) | |
| download | Qt-6c19bdb8552f3cc6ced2a20868f1f1952f94a69c.zip Qt-6c19bdb8552f3cc6ced2a20868f1f1952f94a69c.tar.gz Qt-6c19bdb8552f3cc6ced2a20868f1f1952f94a69c.tar.bz2 | |
Dates and variants are not considered nested objects
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativelistmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 0985a6b..a8a445a 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -999,7 +999,8 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash<int, QVariant> *ro QScriptValueIterator it(value); while (it.hasNext()) { it.next(); - if (it.value().isObject()) { + QScriptValue value = it.value(); + if (!value.isVariant() && !value.isRegExp() && !value.isDate() && value.isObject()) { qmlInfo(m_listModel) << "Cannot add nested list values when modifying or after modification from a worker script"; return false; } |