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>

2 files changed, 10 insertions, 8 deletions

diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index a2eb22189..8bb422e39 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -112,8 +112,10 @@ int main(int argc, char *argv[])
             .arg(mutually.join(QLatin1String(", ")));
         sanityCheck = false;
     }
-    const QSet<QString> commands = parser.positionalArguments().toSet()
-        .intersect(CommandLineOptions::scCommandLineInterfaceOptions.toSet());
+    const QStringList positionalArgs = parser.positionalArguments();
+    QSet<QString> commands(positionalArgs.begin(), positionalArgs.end());
+    commands.intersect(QSet<QString>(CommandLineOptions::scCommandLineInterfaceOptions.begin(),
+                                     CommandLineOptions::scCommandLineInterfaceOptions.end()));
     // Check sanity of the given argument sequence.
     if (commands.size() > 1) {
         sanityMessage = QString::fromLatin1("%1 commands provided, only one can be used at a time.")
@@ -146,7 +148,7 @@ int main(int argc, char *argv[])
 
     if (parser.isSet(CommandLineOptions::scStartServerLong)) {
         const QStringList arguments = parser.value(CommandLineOptions::scStartServerLong)
-            .split(QLatin1Char(','), QString::SkipEmptyParts);
+            .split(QLatin1Char(','), Qt::SkipEmptyParts);
 
         QString socketName, key;
         const QString mode = arguments.value(0);
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h
index 0c09897d7..097886104 100644
--- a/src/sdk/sdkapp.h
+++ b/src/sdk/sdkapp.h
@@ -143,7 +143,7 @@ public:
         if (m_parser.isSet(CommandLineOptions::scLoggingRulesLong)) {
             loggingRules = QLatin1String("ifw.* = false\n");
             loggingRules += m_parser.value(CommandLineOptions::scLoggingRulesLong)
-                          .split(QLatin1Char(','), QString::SkipEmptyParts)
+                          .split(QLatin1Char(','), Qt::SkipEmptyParts)
                           .join(QLatin1Char('\n')); // take rules from command line
         } else if (isCommandLineInterface) {
             loggingRules = QLatin1String("ifw.* = false\n"
@@ -181,7 +181,7 @@ public:
         const QHash<QString, QString> userArgs = userArguments();
         if (m_parser.isSet(CommandLineOptions::scStartClientLong)) {
             const QStringList arguments = m_parser.value(CommandLineOptions::scStartClientLong)
-                .split(QLatin1Char(','), QString::SkipEmptyParts);
+                .split(QLatin1Char(','), Qt::SkipEmptyParts);
             m_core = new QInstaller::PackageManagerCore(
                 magicMarker, oldOperations,
                 arguments.value(0, QLatin1String(QInstaller::Protocol::DefaultSocket)),
@@ -363,7 +363,7 @@ public:
 
             if (m_parser.isSet(CommandLineOptions::scMessageAutomaticAnswerLong)) {
                 const QString positionalArguments = m_parser.value(CommandLineOptions::scMessageAutomaticAnswerLong);
-                const QStringList items = positionalArguments.split(QLatin1Char(','), QString::SkipEmptyParts);
+                const QStringList items = positionalArguments.split(QLatin1Char(','), Qt::SkipEmptyParts);
                 if (items.count() > 0) {
                     errorMessage = setMessageBoxAutomaticAnswers(items);
                     if (!errorMessage.isEmpty())
@@ -376,7 +376,7 @@ public:
             }
             if (m_parser.isSet(CommandLineOptions::scFileDialogAutomaticAnswer)) {
                 const QString positionalArguments = m_parser.value(CommandLineOptions::scFileDialogAutomaticAnswer);
-                const QStringList items = positionalArguments.split(QLatin1Char(','), QString::SkipEmptyParts);
+                const QStringList items = positionalArguments.split(QLatin1Char(','), Qt::SkipEmptyParts);
 
                 foreach (const QString &item, items) {
                     if (item.contains(QLatin1Char('='))) {
@@ -485,7 +485,7 @@ public:
 
     QStringList repositories(const QString &list) const
     {
-        const QStringList items = list.split(QLatin1Char(','), QString::SkipEmptyParts);
+        const QStringList items = list.split(QLatin1Char(','), Qt::SkipEmptyParts);
         foreach (const QString &item, items)
             qCDebug(QInstaller::lcInstallerInstallLog) << "Adding custom repository:" << item;
         return items;