From b631dd9b43329bb42184ae29e8bed3d7c4f0487a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 18 Jul 2018 14:22:34 +0200
Subject: shiboken: Fix command line help

The one-character path options only take one path argument.
Add parameter to the doc generator options.

Task-number: PYSIDE-363
Change-Id: Ia1a0c1552a5d1e3ec86609e9899e985628874545
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/shiboken2/generator/main.cpp                 |  8 ++++----
 sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp
index 6dcd61a5c..900f69166 100644
--- a/sources/shiboken2/generator/main.cpp
+++ b/sources/shiboken2/generator/main.cpp
@@ -308,10 +308,10 @@ void printUsage()
         << qMakePair(QLatin1String("drop-type-entries=\"<TypeEntry0>[;TypeEntry1;...]\""),
                      QLatin1String("Semicolon separated list of type system entries (classes, namespaces,\n"
                                    "global functions and enums) to be dropped from generation."))
-        << qMakePair(QLatin1String("-F") + pathSyntax, QString())
+        << qMakePair(QLatin1String("-F<path>"), QString())
         << qMakePair(QLatin1String("framework-include-paths=") + pathSyntax,
                      QLatin1String("Framework include paths used by the C++ parser"))
-        << qMakePair(QLatin1String("-isystem") + pathSyntax, QString())
+        << qMakePair(QLatin1String("-isystem<path>"), QString())
         << qMakePair(QLatin1String("system-include-paths=") + pathSyntax,
                      QLatin1String("System include paths used by the C++ parser"))
         << qMakePair(QLatin1String("generator-set=<\"generator module\">"),
@@ -319,7 +319,7 @@ void printUsage()
         << qMakePair(QLatin1String("-h"), QString())
         << qMakePair(helpOption(),
                      QLatin1String("Display this help and exit"))
-        << qMakePair(QLatin1String("-I") + pathSyntax, QString())
+        << qMakePair(QLatin1String("-I<path>"), QString())
         << qMakePair(QLatin1String("include-paths=") + pathSyntax,
                      QLatin1String("Include paths used by the C++ parser"))
         << qMakePair(languageLevelOption() + QLatin1String("=, -std=<level>"),
@@ -335,7 +335,7 @@ void printUsage()
                                    "Replaces and overrides command line arguments"))
         << qMakePair(QLatin1String("silent"),
                      QLatin1String("Avoid printing any message"))
-        << qMakePair(QLatin1String("-T") + pathSyntax, QString())
+        << qMakePair(QLatin1String("-T<path>"), QString())
         << qMakePair(QLatin1String("typesystem-paths=") + pathSyntax,
                      QLatin1String("Paths used when searching for typesystems"))
         << qMakePair(QLatin1String("version"),
diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
index 775b541b1..bc0ecc094 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
@@ -2288,18 +2288,18 @@ bool QtDocGenerator::doSetup()
 Generator::OptionDescriptions QtDocGenerator::options() const
 {
     return OptionDescriptions()
-        << qMakePair(QLatin1String("doc-parser"),
+        << qMakePair(QLatin1String("doc-parser=<parser>"),
                      QLatin1String("The documentation parser used to interpret the documentation\n"
                                    "input files (qdoc|doxygen)"))
-        << qMakePair(QLatin1String("documentation-code-snippets-dir"),
+        << qMakePair(QLatin1String("documentation-code-snippets-dir=<dir>"),
                      QLatin1String("Directory used to search code snippets used by the documentation"))
-        << qMakePair(QLatin1String("documentation-data-dir"),
+        << qMakePair(QLatin1String("documentation-data-dir=<dir>"),
                      QLatin1String("Directory with XML files generated by documentation tool"))
-        << qMakePair(QLatin1String("documentation-extra-sections-dir"),
+        << qMakePair(QLatin1String("documentation-extra-sections-dir=<dir>"),
                      QLatin1String("Directory used to search for extra documentation sections"))
-        << qMakePair(QLatin1String("library-source-dir"),
+        << qMakePair(QLatin1String("library-source-dir=<dir>"),
                      QLatin1String("Directory where library source code is located"))
-        << qMakePair(additionalDocumentationOption(),
+        << qMakePair(additionalDocumentationOption() + QLatin1String("=<file>"),
                      QLatin1String("List of additional XML files to be converted to .rst files\n"
                                    "(for example, tutorials)."));
 }
-- 
cgit v1.2.3