Fix deprecation warnings from building with Qt 5.15.2

Also update build version requirements.

Task-number: QTIFW-2388
Change-Id: Iae1949548dda7a3b8d448228e27060efb5abd8eb
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

1 files changed, 10 insertions, 6 deletions

diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 537f6060b..c64a33382 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -132,7 +132,7 @@ static QStringList readArgumentAttributes(QXmlStreamReader &reader, Settings::Pa
                 if (reader.isWhitespace())
                     continue;
                 arguments.append(reader.text().toString().split(QRegularExpression(QLatin1String("\\s+")),
-                    QString::SkipEmptyParts));
+                    Qt::SkipEmptyParts));
             }
             break;
             case QXmlStreamReader::EndElement: {
@@ -713,7 +713,7 @@ Settings::Update Settings::updateRepositoryCategories(const RepoHash &updates)
         }
     }
     if (update) {
-        categories = categoriesList.toSet();
+        categories = QSet<RepositoryCategory>(categoriesList.begin(), categoriesList.end());
         setRepositoryCategories(categories);
     }
     return update ? Settings::UpdatesApplied : Settings::NoUpdatesApplied;
@@ -764,8 +764,10 @@ Settings::Update Settings::updateDefaultRepositories(const RepoHash &updates)
     }
 
     const bool updated = apply(updates, &defaultRepos);
-    if (updated)
-        setDefaultRepositories(defaultRepos.values().toSet());
+    if (updated) {
+        const QList<Repository> repositoriesList = defaultRepos.values();
+        setDefaultRepositories(QSet<Repository>(repositoriesList.begin(), repositoriesList.end()));
+    }
     return updated ? Settings::UpdatesApplied : Settings::NoUpdatesApplied;
 }
 
@@ -816,8 +818,10 @@ Settings::Update Settings::updateUserRepositories(const RepoHash &updates)
     }
 
     const bool updated = apply(updates, &reposToUpdate);
-    if (updated)
-        setUserRepositories(reposToUpdate.values().toSet());
+    if (updated) {
+        const QList<Repository> repositoriesList = reposToUpdate.values();
+        setUserRepositories(QSet<Repository>(repositoriesList.begin(), repositoriesList.end()));
+    }
     return updated ? Settings::UpdatesApplied : Settings::NoUpdatesApplied;
 }