1 files changed, 55 insertions, 5 deletions
diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp
index 0814921a58..2bc60c5b9e 100644
--- a/src/corelib/tools/qcommandlineparser.cpp
+++ b/src/corelib/tools/qcommandlineparser.cpp
@@ -53,6 +53,7 @@ class QCommandLineParserPrivate
 public:
     inline QCommandLineParserPrivate()
         : singleDashWordOptionMode(QCommandLineParser::ParseAsCompactedShortOptions),
+          optionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsOptions),
           builtinVersionOption(false),
           builtinHelpOption(false),
           needsParsing(true)
@@ -103,6 +104,9 @@ public:
     //! The parsing mode for "-abc"
     QCommandLineParser::SingleDashWordOptionMode singleDashWordOptionMode;
 
+    //! How to parse "arg -option"
+    QCommandLineParser::OptionsAfterPositionalArgumentsMode optionsAfterPositionalArgumentsMode;
+
     //! Whether addVersionOption was called
     bool builtinVersionOption;
 
@@ -112,6 +116,7 @@ public:
     //! True if parse() needs to be called
     bool needsParsing;
 };
+Q_DECLARE_TYPEINFO(QCommandLineParserPrivate::PositionalArgumentDefinition, Q_MOVABLE_TYPE);
 
 QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const
 {
@@ -299,6 +304,41 @@ void QCommandLineParser::setSingleDashWordOptionMode(QCommandLineParser::SingleD
 }
 
 /*!
+    \enum QCommandLineParser::OptionsAfterPositionalArgumentsMode
+
+    This enum describes the way the parser interprets options that
+    occur after positional arguments.
+
+    \value ParseAsOptions \c{application argument --opt -t} is interpreted as setting
+    the options \c{opt} and \c{t}, just like \c{application --opt -t argument} would do.
+    This is the default parsing mode. In order to specify that \c{--opt} and \c{-t}
+    are positional arguments instead, the user can use \c{--}, as in
+    \c{application argument -- --opt -t}.
+
+    \value ParseAsPositionalArguments \c{application argument --opt} is interpreted as
+    having two positional arguments, \c{argument} and \c{--opt}.
+    This mode is useful for executables that aim to launch other executables
+    (e.g. wrappers, debugging tools, etc.) or that support internal commands
+    followed by options for the command. \c{argument} is the name of the command,
+    and all options occurring after it can be collected and parsed by another
+    command line parser, possibly in another executable.
+
+    \sa setOptionsAfterPositionalArgumentsMode()
+
+    \since 5.6
+*/
+
+/*!
+    Sets the parsing mode to \a parsingMode.
+    This must be called before process() or parse().
+    \since 5.6
+*/
+void QCommandLineParser::setOptionsAfterPositionalArgumentsMode(QCommandLineParser::OptionsAfterPositionalArgumentsMode parsingMode)
+{
+    d->optionsAfterPositionalArgumentsMode = parsingMode;
+}
+
+/*!
     Adds the option \a option to look for while parsing.
 
     Returns \c true if adding the option was successful; otherwise returns \c false.
@@ -500,7 +540,13 @@ static inline bool displayMessageBox()
 
 static void showParserMessage(const QString &message, MessageType type)
 {
-#if defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
+#if defined(Q_OS_WINRT)
+    if (type == UsageMessage)
+        qInfo(qPrintable(message));
+    else
+        qCritical(qPrintable(message));
+    return;
+#elif defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED) && !defined(Q_OS_WINCE)
     if (displayMessageBox()) {
         const UINT flags = MB_OK | MB_TOPMOST | MB_SETFOREGROUND
             | (type == UsageMessage ? MB_ICONINFORMATION : MB_ICONERROR);
@@ -513,7 +559,7 @@ static void showParserMessage(const QString &message, MessageType type)
                     reinterpret_cast<const wchar_t *>(title.utf16()), flags);
         return;
     }
-#endif // Q_OS_WIN && !QT_BOOTSTRAPPED && !Q_OS_WIN && !Q_OS_WINRT
+#endif // Q_OS_WIN && !QT_BOOTSTRAPPED && !Q_OS_WINCE
     fputs(qPrintable(message), type == UsageMessage ? stdout : stderr);
 }
 
@@ -640,7 +686,7 @@ bool QCommandLineParserPrivate::parse(const QStringList &args)
     const QLatin1Char dashChar('-');
     const QLatin1Char assignChar('=');
 
-    bool doubleDashFound = false;
+    bool forcePositional = false;
     errorText.clear();
     positionalArgumentList.clear();
     optionNames.clear();
@@ -658,7 +704,7 @@ bool QCommandLineParserPrivate::parse(const QStringList &args)
     for (; argumentIterator != args.end() ; ++argumentIterator) {
         QString argument = *argumentIterator;
 
-        if (doubleDashFound) {
+        if (forcePositional) {
             positionalArgumentList.append(argument);
         } else if (argument.startsWith(doubleDashString)) {
             if (argument.length() > 2) {
@@ -670,7 +716,7 @@ bool QCommandLineParserPrivate::parse(const QStringList &args)
                     error = true;
                 }
             } else {
-                doubleDashFound = true;
+                forcePositional = true;
             }
         } else if (argument.startsWith(dashChar)) {
             if (argument.size() == 1) { // single dash ("stdin")
@@ -722,6 +768,8 @@ bool QCommandLineParserPrivate::parse(const QStringList &args)
             }
         } else {
             positionalArgumentList.append(argument);
+            if (optionsAfterPositionalArgumentsMode == QCommandLineParser::ParseAsPositionalArguments)
+                forcePositional = true;
         }
         if (argumentIterator == args.end())
             break;
@@ -1062,6 +1110,8 @@ QString QCommandLineParserPrivate::helpText() const
     ++longestOptionNameString;
     for (int i = 0; i < commandLineOptionList.count(); ++i) {
         const QCommandLineOption &option = commandLineOptionList.at(i);
+        if (option.isHidden())
+            continue;
         text += wrapText(optionNameList.at(i), longestOptionNameString, option.description());
     }
     if (!positionalArgumentDefinitions.isEmpty()) {