Don't mix iterator and const_iterator

Add QT_STRICT_ITERATORS to disallow implicit conversions
between iterator and const_iterator. This avoids potential
detaches of the Qt containers.

Change-Id: I79d381f531ddda9ac402c6f5c63cdc7c6808a0bd
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index 1863286cf..19f4003a4 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -394,7 +394,7 @@ PackageInfoVector QInstallerTools::createListOfPackages(const QStringList &packa
     QFileInfoList entries;
     foreach (const QString &packagesDirectory, packagesDirectories)
         entries.append(QDir(packagesDirectory).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot));
-    for (QFileInfoList::const_iterator it = entries.begin(); it != entries.end(); ++it) {
+    for (QFileInfoList::const_iterator it = entries.constBegin(); it != entries.constEnd(); ++it) {
         if (filterType == Exclude) {
             // Check for current file in exclude list, if found, skip it and remove it from exclude list
             if (packagesToFilter->contains(it->fileName())) {
diff --git a/tools/repocompare/repositorymanager.cpp b/tools/repocompare/repositorymanager.cpp
index 24a41a63c..12df728f4 100644
--- a/tools/repocompare/repositorymanager.cpp
+++ b/tools/repocompare/repositorymanager.cpp
@@ -191,8 +191,8 @@ void RepositoryManager::writeUpdateFile(const QString &fileName)
     }
 
     QStringList items;
-    for (QMap<QString, ComponentDescription>::const_iterator it = updateMap.begin(); it != updateMap.end();
-        ++it) {
+    for (QMap<QString, ComponentDescription>::const_iterator it = updateMap.constBegin();
+         it != updateMap.constEnd(); ++it) {
             if (it.value().update)
                 items.append(it.key());
     }