Fix deprecation warnings about deprecated container conversions

Fix warnings introduced by
qtbase/92f984273262531f909ede17a324f546fe502b5c.

Change-Id: Iaca85ad36591f7208f63305b885e7ff59c014a72
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 

3 files changed, 8 insertions, 6 deletions

diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index e96e102af..eb0549cee 100644
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -1376,7 +1376,7 @@ void CppParser::processInclude(const QString &file, ConversionData &cd, const QS
 
     const int index = includeStack.indexOf(cleanFile);
     if (index != -1) {
-        CppFiles::addIncludeCycle(includeStack.mid(index).toSet());
+        CppFiles::addIncludeCycle(QSet<QString>(includeStack.cbegin() + index, includeStack.cend()));
         return;
     }
 
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index d9c6f7966..d74f213cc 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -529,14 +529,14 @@ static QSet<QString> projectRoots(const QString &projectFile, const QStringList
     sourceDirs.insert(proPath + QLatin1Char('/'));
     for (const QString &sf : sourceFiles)
         sourceDirs.insert(sf.left(sf.lastIndexOf(QLatin1Char('/')) + 1));
-    QStringList rootList = sourceDirs.toList();
+    QStringList rootList = sourceDirs.values();
     rootList.sort();
     for (int prev = 0, curr = 1; curr < rootList.length(); )
         if (rootList.at(curr).startsWith(rootList.at(prev)))
             rootList.removeAt(curr);
         else
             prev = curr++;
-    return rootList.toSet();
+    return QSet<QString>(rootList.cbegin(), rootList.cend());
 }
 
 class ProjectProcessor
diff --git a/src/linguist/shared/projectdescriptionreader.cpp b/src/linguist/shared/projectdescriptionreader.cpp
index 5b4a53f25..e61b81e09 100644
--- a/src/linguist/shared/projectdescriptionreader.cpp
+++ b/src/linguist/shared/projectdescriptionreader.cpp
@@ -72,18 +72,20 @@ private:
                     << QStringLiteral("sources")
                     << QStringLiteral("subProjects")
                     << QStringLiteral("translations");
-        const QSet<QString> actualKeys = project.keys().toSet();
+        QSet<QString> actualKeys;
+        for (auto it = project.constBegin(), end = project.constEnd(); it != end; ++it)
+            actualKeys.insert(it.key());
         const QSet<QString> missingKeys = requiredKeys - actualKeys;
         if (!missingKeys.isEmpty()) {
             *m_errorString = FMT::tr("Missing keys in project description: %1.").arg(
-                    missingKeys.toList().join(QLatin1String(", ")));
+                    missingKeys.values().join(QLatin1String(", ")));
             return false;
         }
         const QSet<QString> unexpected = actualKeys - allowedKeys;
         if (!unexpected.isEmpty()) {
             *m_errorString = FMT::tr("Unexpected keys in project %1: %2").arg(
                     project.value(QStringLiteral("projectFile")).toString(),
-                    unexpected.toList().join(QLatin1String(", ")));
+                    unexpected.values().join(QLatin1String(", ")));
             return false;
         }
         return isValidProjectDescription(project.value(QStringLiteral("subProjects")).toArray());