diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-30 01:00:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-30 01:00:19 +0200 |
| commit | 07e92611050f78dae93bcd362112efd8efa7b41e (patch) | |
| tree | 6951f77a6344436150c4f83f407e09d946f2c6c3 /tests/auto/corelib/tools/qcommandlineparser | |
| parent | 69e68218e5082166d5c4ab1903fbacde00418a1c (diff) | |
| parent | caa598c843eb27fd0c645e62723fd2d4e3e12f60 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaa438d14357be1bf75bb645cb8d3245947c055b8
Diffstat (limited to 'tests/auto/corelib/tools/qcommandlineparser')
| -rw-r--r-- | tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp | 1 |
2 files changed, 2 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 30c7b1bf69..b9bcecd607 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp +++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.cpp @@ -53,6 +53,7 @@ int main(int argc, char *argv[]) parser.addOption(QCommandLineOption("load", "Load file from URL.", "url")); parser.addOption(QCommandLineOption(QStringList() << "o" << "output", "Set output file.", "file")); parser.addOption(QCommandLineOption("D", "Define macro.", "key=value")); + parser.addOption(QCommandLineOption("long-option")); // An option with a longer description, to test wrapping QCommandLineOption noImplicitIncludesOption(QStringList() << QStringLiteral("n") << QStringLiteral("no-implicit-includes")); diff --git a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp index ce3bdc2d9d..62c29229e1 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp +++ b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp @@ -536,6 +536,7 @@ static const char expectedOptionsHelp[] = " --load <url> Load file from URL.\n" " -o, --output <file> Set output file.\n" " -D <key=value> Define macro.\n" + " --long-option\n" " -n, --no-implicit-includes Disable magic generation of implicit\n" " #include-directives.\n" " --newline This is an option with a rather long\n" |