summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-29 23:53:03 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-29 23:53:03 (GMT)
commit1f8e66b71bc641a9e29f3b3157de2d393d911f23 (patch)
tree21c0f0063455abdb44e2b0ec529eca57e795d00f /src
parenta432859f0494b127495932b7365b62a4e579dc2e (diff)
downloadQt-1f8e66b71bc641a9e29f3b3157de2d393d911f23.zip
Qt-1f8e66b71bc641a9e29f3b3157de2d393d911f23.tar.gz
Qt-1f8e66b71bc641a9e29f3b3157de2d393d911f23.tar.bz2
Fix and test ListModel UTF8 reading.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qmllistmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 5491fd7..8259dcd 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -851,7 +851,7 @@ void QmlListModelParser::setCustomData(QObject *obj, const QByteArray &d)
case ListInstruction::Value:
{
ModelNode *n = nodes.top();
- n->values.append(QByteArray(data + instr.dataIdx));
+ n->values.append(QString::fromUtf8(QByteArray(data + instr.dataIdx)));
}
break;