feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

App: Also accept --version with two dashs

Browse Source 
That more common on Linux.

Change-Id: Id724932565a6d5292012e446914ef4fac1b4f652
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-10-19 12:38:16 +02:00
parent 0819bf3781
commit b4446607ec
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/main.cpp
View File

@@ -85,6 +85,7 @@ const char HELP_OPTION2[] = "-help";
const char HELP_OPTION3[] = "/h"; const char HELP_OPTION3[] = "/h";
const char HELP_OPTION4[] = "--help"; const char HELP_OPTION4[] = "--help";
const char VERSION_OPTION[] = "-version"; const char VERSION_OPTION[] = "-version";
const char VERSION_OPTION2[] = "--version";
const char CLIENT_OPTION[] = "-client"; const char CLIENT_OPTION[] = "-client";
const char SETTINGS_OPTION[] = "-settingspath"; const char SETTINGS_OPTION[] = "-settingspath";
const char INSTALL_SETTINGS_OPTION[] = "-installsettingspath"; const char INSTALL_SETTINGS_OPTION[] = "-installsettingspath";
@@ -639,6 +640,7 @@ int main(int argc, char **argv)
appOptions.insert(QLatin1String(HELP_OPTION3), false); appOptions.insert(QLatin1String(HELP_OPTION3), false);
appOptions.insert(QLatin1String(HELP_OPTION4), false); appOptions.insert(QLatin1String(HELP_OPTION4), false);
appOptions.insert(QLatin1String(VERSION_OPTION), false); appOptions.insert(QLatin1String(VERSION_OPTION), false);
appOptions.insert(QLatin1String(VERSION_OPTION2), false);
appOptions.insert(QLatin1String(CLIENT_OPTION), false); appOptions.insert(QLatin1String(CLIENT_OPTION), false);
appOptions.insert(QLatin1String(PID_OPTION), true); appOptions.insert(QLatin1String(PID_OPTION), true);
appOptions.insert(QLatin1String(BLOCK_OPTION), false); appOptions.insert(QLatin1String(BLOCK_OPTION), false);
@@ -682,7 +684,8 @@ int main(int argc, char **argv)
displayError(msgCoreLoadFailure(coreplugin->errorString())); displayError(msgCoreLoadFailure(coreplugin->errorString()));
return 1; return 1;
} }
if (foundAppOptions.contains(QLatin1String(VERSION_OPTION))) { if (foundAppOptions.contains(QLatin1String(VERSION_OPTION))
|| foundAppOptions.contains(QLatin1String(VERSION_OPTION2))) {
printVersion(coreplugin); printVersion(coreplugin);
return 0; return 0;
} }