Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion share/qtcreator/sfdk/modules/20-building-mb2.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,17 @@
{
"name": "search-output-dir",
"trArgument": "[verbose|quiet]",
"trDescription": "Consider the RPM packages found in the output directory when installing build time dependencies. The optional value controls zypper verbosity. The default is 'verbose'.",
"trDescription": "Consider the RPM packages found in the output directory when installing build time dependencies. The optional value controls zypper verbosity. The default is 'verbose'.\n\nBy default the already installed packages from output directory are upgraded using 'zypper dup' before installing build time dependencies. This can be disabled with 'no-zypper-dup'",
"validator": "module.validateSearchOutputDirOption"
},
{
"name": "no-search-output-dir",
"trDescription": "Override 'search-output-dir' option"
},
{
"name": "no-zypper-dup",
"trDescription": "Disable upgrading installed packages before installing build time dependencies. Only effective with 'search-output-dir'"
},
{
"name": "snapshot",
"trArgument": "[<suffix>]",
Expand Down
1 change: 1 addition & 0 deletions src/plugins/mer/merbuildconfigurationaspect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ const QStringList MerBuildConfigurationAspect::s_allowedSfdkOptions{
"output-prefix",
"search-output-dir",
"no-search-output-dir",
"no-zypper-dup",
"snapshot",
"force-no-snapshot",
"task",
Expand Down