summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-09-17 05:33:22 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-09-17 05:33:22 (GMT)
commitaf29c555a29ebcdb1d962176912478212c9c7e65 (patch)
tree9c2129694e455d36725f5571c2864a4b9b0c92c5 /src
parentc2bbef949126826f0330c69dff1a8c96919f69a5 (diff)
downloadQt-af29c555a29ebcdb1d962176912478212c9c7e65.zip
Qt-af29c555a29ebcdb1d962176912478212c9c7e65.tar.gz
Qt-af29c555a29ebcdb1d962176912478212c9c7e65.tar.bz2
Improve error messages
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qdeclarativelistmodel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 68e97b0..2d8b946 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -292,7 +292,7 @@ QDeclarativeListModelWorkerAgent *QDeclarativeListModel::agent()
return m_agent;
if (!flatten()) {
- qmlInfo(this) << "List contains nested list values and cannot be used from a worker script";
+ qmlInfo(this) << "List contains list-type data and cannot be used from a worker script";
return 0;
}
@@ -1023,7 +1023,7 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash<int, QVariant> *ro
it.next();
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";
+ qmlInfo(m_listModel) << "Cannot add list-type data when modifying or after modification from a worker script";
return false;
}
@@ -1129,7 +1129,7 @@ QScriptDeclarativeClass::Value FlatListScriptClass::property(Object *obj, const
void FlatListScriptClass::setProperty(Object *obj, const Identifier &name, const QScriptValue &value)
{
if (!value.isVariant() && !value.isRegExp() && !value.isDate() && value.isObject()) {
- qmlInfo(m_model->m_listModel) << "Cannot add nested list values when modifying or after modification from a worker script";
+ qmlInfo(m_model->m_listModel) << "Cannot add list-type data when modifying or after modification from a worker script";
return;
}