Add QCommandLineOption::Flags containing HiddenFromHelp and ShortOptionStyle

This patch adds a new option, QCommandLineOption::ShortOptionStyle, which helps
applications (such as compilers, so moc and now qdoc) which need to mix long-style
and short flags.

[ChangeLog][QtCore][QCommandLineOption] Added flags() and setFlags() methods.
Added ShortOptionStyle and HiddenFromHelp flags.

Change-Id: I944ce56aff2b28ecd6bb9d2d23c4e726e9d06647
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp b/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp
index 36bc8621d2..30c7b1bf69 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp
+++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp
@@ -71,8 +71,12 @@ int main(int argc, char *argv[])
     // A hidden option
     QCommandLineOption hiddenOption(QStringList() << QStringLiteral("hidden"));
     hiddenOption.setDescription(QStringLiteral("THIS SHOULD NEVER APPEAR"));
-    hiddenOption.setHidden(true);
+    hiddenOption.setFlags(QCommandLineOption::HiddenFromHelp);
     parser.addOption(hiddenOption);
+    QCommandLineOption hiddenOption2(QStringList() << QStringLiteral("hidden2"));
+    hiddenOption2.setDescription(QStringLiteral("NEITHER SHOULD THIS"));
+    hiddenOption2.setHidden(true);
+    parser.addOption(hiddenOption2);
 
     // This program supports different options depending on the "command" (first argument).
     // Call parse() to find out the positional arguments.