Fix escape handling in qWinCmdArgs

-DKEY="VALUE" was correctly turned into -DKEY=VALUE,
but -DKEY=\"VALUE\" was turned into -DKEY=\VALUE"
due to the erroneous check ('quote' is still 0 when
encountering the first '\' character).

This fixes QCoreApplication::arguments() as used by
moc.exe after porting to QCommandLineParser.

Further investigation shows that double-quotes and single-quotes
are handled differently. The tests now ensure that this parser
respects what Windows sends in argv, and in particular that
QTBUG-15379 doesn't regress, as well as fixing QTBUG-30628.

Task-number: QTBUG-15379, QTBUG-30628

Change-Id: I95062c9a6022632b321b2f6fae3089f07be7b5c6
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 8 insertions, 0 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 c7bd2a5dc9..07f8ddfc8e 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp
+++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp
@@ -50,6 +50,13 @@ int main(int argc, char *argv[])
     QCoreApplication app(argc, argv);
     app.setApplicationVersion("1.0");
 
+    // Test for QCoreApplication::arguments()
+    const QStringList incomingArgs = QCoreApplication::arguments();
+    for (int i = 0; i < argc; ++i) {
+        if (incomingArgs.at(i) != QLatin1String(argv[i]))
+            qDebug() << "ERROR: arguments[" << i << "] was" << incomingArgs.at(i) << "expected" << argv[i];
+    }
+
     QCommandLineParser parser;
     parser.setApplicationDescription("Test helper");
     parser.addHelpOption();
@@ -87,6 +94,7 @@ int main(int argc, char *argv[])
     }
 
     printf("Positional arguments: %s\n", qPrintable(parser.positionalArguments().join(",")));
+    printf("Macros: %s\n", qPrintable(parser.values("D").join(",")));
 
     return 0;
 }