Allow "-h" or "--help" to get general help.

These don't really fit into our syntax, but because of the "default
command" feature, people would get surprising output for them
if they were not supported (namely, the build-specific help).

Change-Id: I50dc69679803aaeec5937fbf5f8df492f1928180
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index dd28de317..3a3262181 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -228,8 +228,16 @@ void CommandLineParser::CommandLineParserPrivate::doParse()
         try {
             command = commandFromString(commandLine.first());
             commandLine.removeFirst();
-        } catch (const Error &) { // No command given, use default.
-            command = commandPool.getCommand(BuildCommandType);
+        } catch (const Error &) { // No command given.
+            // As an exception to the command-based syntax, we allow -h or --help as the
+            // sole contents of the command line, because people are used to this working.
+            if (commandLine.count() == 1 && (commandLine.first() == QLatin1String("-h")
+                                             || commandLine.first() == QLatin1String("--help"))) {
+                command = commandPool.getCommand(HelpCommandType);
+                commandLine.clear();
+            } else {
+                command = commandPool.getCommand(BuildCommandType);
+            }
         }
     }
     command->parse(commandLine);