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, 1 insertions, 4 deletions

diff --git a/sources/shiboken2/ApiExtractor/apiextractor.cpp b/sources/shiboken2/ApiExtractor/apiextractor.cpp
index abb7c08b9..bce3a6e3f 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken2/ApiExtractor/apiextractor.cpp
@@ -243,10 +243,7 @@ bool ApiExtractor::run()
     if (m_builder)
         return false;
 
-    if (m_typeSystemFileName.isEmpty()) {
-        std::cerr << "You must specify a Type System file." << std::endl;
-        return false;
-    } else if (!TypeDatabase::instance()->parseFile(m_typeSystemFileName)) {
+    if (!TypeDatabase::instance()->parseFile(m_typeSystemFileName)) {
         std::cerr << "Cannot parse file: " << qPrintable(m_typeSystemFileName);
         return false;
     }