whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add QCommandLineParser::showVersion(), similar to showHelp(). 

Change-Id: I1782c226ee8c457a68eb9ae9948a2a6a700d7a52
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
David Faure 2014-03-13 21:34:00 +01:00 committed by The Qt Project
parent f8b727d94b
commit ab0d7f5619
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/corelib/tools/qcommandlineparser.cpp
View File

@ -423,10 +423,8 @@ void QCommandLineParser::process(const QStringList &arguments)
::exit(EXIT_FAILURE);
}
if (d->builtinVersionOption && isSet(QStringLiteral("version"))) {
printf("%s %s\n", qPrintable(QCoreApplication::applicationName()), qPrintable(QCoreApplication::applicationVersion()));
::exit(EXIT_SUCCESS);
}
if (d->builtinVersionOption && isSet(QStringLiteral("version")))
showVersion();
if (d->builtinHelpOption && isSet(QStringLiteral("help")))
showHelp(EXIT_SUCCESS);
@ -815,6 +813,22 @@ QStringList QCommandLineParser::unknownOptionNames() const
return d->unknownOptionNames;
}
/*!
Displays the version information from QCoreApplication::applicationVersion(),
and exits the application.
This is automatically triggered by the --version option, but can also
be used to display the version when not using process().
The exit code is set to EXIT_SUCCESS (0).
\sa addVersionOption()
\since 5.4
*/
Q_NORETURN void QCommandLineParser::showVersion()
{
fprintf(stdout, "%s %s\n", qPrintable(QCoreApplication::applicationName()), qPrintable(QCoreApplication::applicationVersion()));
::exit(EXIT_SUCCESS);
}
/*!
Displays the help information, and exits the application.
This is automatically triggered by the --help option, but can also

1
src/corelib/tools/qcommandlineparser.h
View File

@ -92,6 +92,7 @@ public:
QStringList optionNames() const;
QStringList unknownOptionNames() const;
Q_NORETURN void showVersion();
Q_NORETURN void showHelp(int exitCode = 0);
QString helpText() const;