Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid conflict between Syncthing's CLI `--help` arg and own `--help` arg

This commit is contained in:
Martchus 2022-06-26 11:27:46 +02:00
parent 6ae9015605
commit bfb7af18fe
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tray/CMakeLists.txt
View File

@ -93,7 +93,7 @@ set(REQUIRED_ICONS
window-close)
# find c++utilities
find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.16.0 REQUIRED)
find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.17.0 REQUIRED)
use_cpp_utilities()
# find qtutilities

3
tray/application/main.cpp
View File

@ -178,7 +178,10 @@ int runApplication(int argc, const char *const *argv)
widgetsGuiArg.addSubArgument(&newInstanceArg);
#ifdef SYNCTHINGTRAY_USE_LIBSYNCTHING
auto cliArg = OperationArgument("cli", 'c', "run Syncthing's CLI");
auto cliHelp = ConfigValueArgument("help", 'h', "show help for Syncthing's CLI");
cliArg.setRequiredValueCount(Argument::varValueCount);
cliArg.setFlags(Argument::Flags::Greedy, true);
cliArg.setSubArguments({ &cliHelp });
#endif
parser.setMainArguments({ &qtConfigArgs.qtWidgetsGuiArg(),