summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-04-08 12:54:31 (GMT)
committermae <qt-info@nokia.com>2010-04-08 13:00:34 (GMT)
commitdc2429a34e8d0168ef33f48ec0da35631be49243 (patch)
tree39c563572d5bde32571922eb735c094b9093f08b /src
parent3d320b5a2659022cd9b487d3685fd19bcc4d598c (diff)
downloadQt-dc2429a34e8d0168ef33f48ec0da35631be49243.zip
Qt-dc2429a34e8d0168ef33f48ec0da35631be49243.tar.gz
Qt-dc2429a34e8d0168ef33f48ec0da35631be49243.tar.bz2
Fix compile warnings
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativecompositetypemanager.cpp2
-rw-r--r--src/declarative/util/qdeclarativexmllistmodel.cpp2
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();