aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/generator/generator.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-07 15:56:37 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-09 13:49:18 +0000
commita3e4e367cf462e2dd9d7b08fe8d3f0007c33e1fa (patch)
treea2c8d3fc3719656a18aaf2b3734fc73466efca06 /sources/shiboken2/generator/generator.cpp
parent798d3edb8ff260e7a6cf56640121146bc6e62593 (diff)
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>
Diffstat (limited to 'sources/shiboken2/generator/generator.cpp')
-rw-r--r--sources/shiboken2/generator/generator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken2/generator/generator.cpp
index 76d104c12..f60b195f2 100644
--- a/sources/shiboken2/generator/generator.cpp
+++ b/sources/shiboken2/generator/generator.cpp
@@ -194,9 +194,9 @@ QVector<const AbstractMetaType*> Generator::instantiatedSmartPointers() const
return m_d->instantiatedSmartPointers;
}
-QMap< QString, QString > Generator::options() const
+Generator::OptionDescriptions Generator::options() const
{
- return QMap<QString, QString>();
+ return OptionDescriptions();
}
AbstractMetaClassList Generator::classes() const