From dc2429a34e8d0168ef33f48ec0da35631be49243 Mon Sep 17 00:00:00 2001
From: mae <qt-info@nokia.com>
Date: Thu, 8 Apr 2010 14:54:31 +0200
Subject: Fix compile warnings

---
 src/declarative/qml/qdeclarativecompositetypemanager.cpp | 2 +-
 src/declarative/util/qdeclarativexmllistmodel.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
index 61978a4..ccf10c6 100644
--- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp
+++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
@@ -634,7 +634,7 @@ int QDeclarativeCompositeTypeManager::resolveTypes(QDeclarativeCompositeTypeData
             QDeclarativeError error;
             error.setUrl(unit->imports.baseUrl());
             QString userTypeName = QString::fromUtf8(typeName);
-            userTypeName.replace('/','.');
+            userTypeName.replace(QLatin1Char('/'),QLatin1Char('.'));
             if (typeNamespace)
                 error.setDescription(tr("Namespace %1 cannot be used as a type").arg(userTypeName));
             else
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index b33af06..7f8b962 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -160,7 +160,7 @@ public:
 
         for (int i=0; i<roleObjects->count(); i++) {
             if (!roleObjects->at(i)->isValid()) {
-                job.roleQueries << "";
+                job.roleQueries << QString();
                 continue;
             }
             job.roleQueries << roleObjects->at(i)->query();
-- 
cgit v0.12