aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecustomparser.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-07-11 11:03:31 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-30 13:18:28 +0200
commit71af1349f5498e1f6a213bacd531f4f77840f24f (patch)
tree51c9acc1e413c558dc0c760bb253530b524b887d /src/declarative/qml/qdeclarativecustomparser.cpp
parent809ee66b67ce70dba89a04b92daccc9445af2e75 (diff)
Remove some QByteArray<->QString conversions
Change-Id: Ieba3e1754d6438bb13fe7bf9963456a29d122129 Reviewed-on: http://codereview.qt.nokia.com/3742 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecustomparser.cpp')
-rw-r--r--src/declarative/qml/qdeclarativecustomparser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
index e80d911bb5..ed899148bc 100644
--- a/src/declarative/qml/qdeclarativecustomparser.cpp
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -101,7 +101,7 @@ QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeParser::Object *root
rootNode.d->name = root->typeName;
rootNode.d->location = root->location.start;
- for(QHash<QByteArray, Property *>::Iterator iter = root->properties.begin();
+ for(QHash<QString, Property *>::Iterator iter = root->properties.begin();
iter != root->properties.end();
++iter) {
@@ -120,7 +120,7 @@ QDeclarativeCustomParserProperty
QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeParser::Property *p)
{
QDeclarativeCustomParserProperty prop;
- prop.d->name = p->name;
+ prop.d->name = p->name.toUtf8();
prop.d->isList = (p->values.count() > 1);
prop.d->location = p->location.start;