From 71af1349f5498e1f6a213bacd531f4f77840f24f Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Mon, 11 Jul 2011 11:03:31 +1000
Subject: Remove some QByteArray<->QString conversions

Change-Id: Ieba3e1754d6438bb13fe7bf9963456a29d122129
Reviewed-on: http://codereview.qt.nokia.com/3742
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
---
 src/declarative/qml/qdeclarativecustomparser.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/declarative/qml/qdeclarativecustomparser.cpp')

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;
 
-- 
cgit v1.2.3