shiboken: Further refactor command line arguments and help

Replace the QMap of options returned by the generators by a vector
of pairs to allow for specifying the order. This allows
for better formatting -I/-F/-T in multiple lines.

Add -h for help.

Move the missing typelib file handling into main and print a help hint
there.

Change-Id: I5a95bd8d193be012aaa7ce3934945b25e21d3f79
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 12 insertions, 13 deletions

diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
index 02fd40354..014b44476 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
@@ -1697,19 +1697,18 @@ bool QtDocGenerator::doSetup(const QMap<QString, QString>& args)
 }
 
 
-QMap<QString, QString> QtDocGenerator::options() const
+Generator::OptionDescriptions QtDocGenerator::options() const
 {
-    QMap<QString, QString> options;
-    options.insert(QLatin1String("doc-parser"),
-                   QLatin1String("The documentation parser used to interpret the documentation input files (qdoc3|doxygen)"));
-    options.insert(QLatin1String("library-source-dir"),
-                   QLatin1String("Directory where library source code is located"));
-    options.insert(QLatin1String("documentation-data-dir"),
-                   QLatin1String("Directory with XML files generated by documentation tool (qdoc3 or Doxygen)"));
-    options.insert(QLatin1String("documentation-code-snippets-dir"),
-                   QLatin1String("Directory used to search code snippets used by the documentation"));
-    options.insert(QLatin1String("documentation-extra-sections-dir"),
-                   QLatin1String("Directory used to search for extra documentation sections"));
-    return options;
+    return OptionDescriptions()
+        << qMakePair(QLatin1String("doc-parser"),
+                     QLatin1String("The documentation parser used to interpret the documentation input files (qdoc3|doxygen)"))
+        << qMakePair(QLatin1String("documentation-code-snippets-dir"),
+                     QLatin1String("Directory used to search code snippets used by the documentation"))
+        << qMakePair(QLatin1String("documentation-data-dir"),
+                     QLatin1String("Directory with XML files generated by documentation tool (qdoc3 or Doxygen)"))
+        << qMakePair(QLatin1String("documentation-extra-sections-dir"),
+                     QLatin1String("Directory used to search for extra documentation sections"))
+        << qMakePair(QLatin1String("library-source-dir"),
+                     QLatin1String("Directory where library source code is located"));
 }