Expand the sanity check for mutually exclusive options

Task-number: QTIFW-1744
Change-Id: I4a4fdcd2517028e05f9282c15a91a4fb83c24901
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

1 files changed, 23 insertions, 11 deletions

diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp
index ee4f9d74a..9b425bc98 100644
--- a/src/sdk/main.cpp
+++ b/src/sdk/main.cpp
@@ -85,17 +85,29 @@ int main(int argc, char *argv[])
     QString sanityMessage;
 
     QStringList mutually;
-    if (parser.isSet(CommandLineOptions::scStartUpdaterLong))
-        mutually << CommandLineOptions::scStartUpdaterLong;
-    if (parser.isSet(CommandLineOptions::scStartPackageManagerLong))
-        mutually << CommandLineOptions::scStartPackageManagerLong;
-    if (parser.isSet(CommandLineOptions::scStartUninstallerLong))
-        mutually << CommandLineOptions::scStartUninstallerLong;
-    // IFW 3.x.x style --updater option support provided for backward compatibility
-    if (parser.isSet(CommandLineOptions::scDeprecatedUpdater))
-        mutually << CommandLineOptions::scDeprecatedUpdater;
-
-    if (mutually.count() > 1) {
+    mutually = QInstaller::checkMutualOptions(parser, QStringList()
+        << CommandLineOptions::scStartUpdaterLong
+        << CommandLineOptions::scStartPackageManagerLong
+        << CommandLineOptions::scStartUninstallerLong
+        << CommandLineOptions::scDeprecatedUpdater);
+
+    if (mutually.isEmpty()) {
+        mutually = QInstaller::checkMutualOptions(parser, QStringList()
+            << CommandLineOptions::scSystemProxyLong
+            << CommandLineOptions::scNoProxyLong);
+    }
+    if (mutually.isEmpty()) {
+        mutually = QInstaller::checkMutualOptions(parser, QStringList()
+            << CommandLineOptions::scAcceptMessageQuery
+            << CommandLineOptions::scRejectMessageQuery
+            << CommandLineOptions::scMessageDefaultAnswer);
+    }
+    if (mutually.isEmpty()) {
+        mutually = QInstaller::checkMutualOptions(parser, QStringList()
+            << CommandLineOptions::scStartServerLong
+            << CommandLineOptions::scStartClientLong);
+    }
+    if (!mutually.isEmpty()) {
         sanityMessage = QString::fromLatin1("The following options are mutually exclusive: %1.")
             .arg(mutually.join(QLatin1String(", ")));
         sanityCheck = false;