Disable message acceptance and file query options on GUI

Also add "command-line-only" remarks for the rest of the options that
are only supported on CLI to their help description.

Task-number: QTIFW-1789
Change-Id: I08cc27dee4eb4aad7a2e5c2721c56ae524766955
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

1 files changed, 31 insertions, 28 deletions

diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h
index 378555633..ecc91699a 100644
--- a/src/sdk/sdkapp.h
+++ b/src/sdk/sdkapp.h
@@ -274,39 +274,42 @@ public:
         if (m_parser.isSet(CommandLineOptions::scAcceptLicenses))
             m_core->setAutoAcceptLicenses();
 
-        if (m_parser.isSet(CommandLineOptions::scAcceptMessageQuery))
-            m_core->autoAcceptMessageBoxes();
-        if (m_parser.isSet(CommandLineOptions::scRejectMessageQuery))
-            m_core->autoRejectMessageBoxes();
-
-        if (m_parser.isSet(CommandLineOptions::scMessageAutomaticAnswer)) {
-            const QString positionalArguments = m_parser.value(CommandLineOptions::scMessageAutomaticAnswer);
-            const QStringList items = positionalArguments.split(QLatin1Char(','), QString::SkipEmptyParts);
-            if (items.count() > 0) {
-                errorMessage = setMessageBoxAutomaticAnswers(items);
-                if (!errorMessage.isEmpty())
+        // Ignore message acceptance options when running the installer with GUI
+        if (m_core->isCommandLineInstance()) {
+            if (m_parser.isSet(CommandLineOptions::scAcceptMessageQuery))
+                m_core->autoAcceptMessageBoxes();
+
+            if (m_parser.isSet(CommandLineOptions::scRejectMessageQuery))
+                m_core->autoRejectMessageBoxes();
+
+            if (m_parser.isSet(CommandLineOptions::scMessageDefaultAnswer))
+                m_core->acceptMessageBoxDefaultButton();
+
+            if (m_parser.isSet(CommandLineOptions::scMessageAutomaticAnswer)) {
+                const QString positionalArguments = m_parser.value(CommandLineOptions::scMessageAutomaticAnswer);
+                const QStringList items = positionalArguments.split(QLatin1Char(','), QString::SkipEmptyParts);
+                if (items.count() > 0) {
+                    errorMessage = setMessageBoxAutomaticAnswers(items);
+                    if (!errorMessage.isEmpty())
+                        return false;
+                } else {
+                    errorMessage = QObject::tr("Arguments missing for option %1").arg(CommandLineOptions::scMessageAutomaticAnswer);
                     return false;
-            } else {
-                errorMessage = QObject::tr("Arguments missing for option %1").arg(CommandLineOptions::scMessageAutomaticAnswer);
-                return false;
+                }
             }
-        }
-
-        if (m_parser.isSet(CommandLineOptions::scFileDialogAutomaticAnswer)) {
-            const QString positionalArguments = m_parser.value(CommandLineOptions::scFileDialogAutomaticAnswer);
-            const QStringList items = positionalArguments.split(QLatin1Char(','), QString::SkipEmptyParts);
-
-            foreach (const QString &item, items) {
-                if (item.contains(QLatin1Char('='))) {
-                    const QString name = item.section(QLatin1Char('='), 0, 0);
-                    QString value = item.section(QLatin1Char('='), 1, 1);
-                    m_core->setFileDialogAutomaticAnswer(name, value);
+            if (m_parser.isSet(CommandLineOptions::scFileDialogAutomaticAnswer)) {
+                const QString positionalArguments = m_parser.value(CommandLineOptions::scFileDialogAutomaticAnswer);
+                const QStringList items = positionalArguments.split(QLatin1Char(','), QString::SkipEmptyParts);
+
+                foreach (const QString &item, items) {
+                    if (item.contains(QLatin1Char('='))) {
+                        const QString name = item.section(QLatin1Char('='), 0, 0);
+                        QString value = item.section(QLatin1Char('='), 1, 1);
+                        m_core->setFileDialogAutomaticAnswer(name, value);
+                    }
                 }
             }
         }
-        if (m_parser.isSet(CommandLineOptions::scMessageDefaultAnswer)) {
-            m_core->acceptMessageBoxDefaultButton();
-        }
 
         try {
             ProductKeyCheck::instance()->init(m_core);