diff options
Diffstat (limited to 'doc/reference/cli/tools')
-rw-r--r-- | doc/reference/cli/tools/cli-config-ui.qdoc | 3 | ||||
-rw-r--r-- | doc/reference/cli/tools/cli-config.qdoc | 24 | ||||
-rw-r--r-- | doc/reference/cli/tools/cli-setup-qt.qdoc | 5 | ||||
-rw-r--r-- | doc/reference/cli/tools/cli-setup-toolchains.qdoc | 5 |
4 files changed, 29 insertions, 8 deletions
diff --git a/doc/reference/cli/tools/cli-config-ui.qdoc b/doc/reference/cli/tools/cli-config-ui.qdoc index 29c0ed732..66f46e3e1 100644 --- a/doc/reference/cli/tools/cli-config-ui.qdoc +++ b/doc/reference/cli/tools/cli-config-ui.qdoc @@ -37,7 +37,7 @@ \section1 Synopsis \code - qbs config-ui [--settings-dir <directory>] + qbs config-ui [--settings-dir <directory>] [--system] \endcode \section1 Description @@ -54,6 +54,7 @@ \section1 Options \include cli-options.qdocinc settings-dir + \include cli-options.qdocinc config-ui-system \include cli-options.qdocinc help \section1 Examples diff --git a/doc/reference/cli/tools/cli-config.qdoc b/doc/reference/cli/tools/cli-config.qdoc index 0d2ba9989..e32ffee0e 100644 --- a/doc/reference/cli/tools/cli-config.qdoc +++ b/doc/reference/cli/tools/cli-config.qdoc @@ -36,10 +36,10 @@ \section1 Synopsis \code - qbs config [--settings-dir <directory>] [--list [<root> ...]] + qbs config [--settings-dir <directory>] [--user|--system] [--list [<root> ...]] [--unset <key>] [--export <file>] [--import <file>] - qbs config [--settings-dir <directory>] <key> - qbs config [--settings-dir <directory>] <key> <value> + qbs config [--settings-dir <directory>] [--user|--system] <key> + qbs config [--settings-dir <directory>] [--user|--system] <key> <value> \endcode \section1 Description @@ -52,6 +52,22 @@ The third form sets the specified \c <key> with the specified \c <value>. + There are two sets of settings: The system-level settings affect all users, + while the user-level settings are specific to the current user. + By default, the read operations consider both sources. If the same key is + present in both settings, then for list values, the system value is + appended to the user value, while for other types of values the user-level + one takes precedence. Write operations go to the user-level settings by default. + Use the \c {--user} and \c {--system} options to change this behavior. + \note It is conceivable that the default system value of the + \c {preferences.qbsSearchPaths} setting could pull in unwanted \QBS modules, + in particular when doing cross-builds. In such a case, you can set + \c {preferences.ignoreSystemSearchPaths} to exclude the search paths coming + from the system settings. You'll typically do this for a specific profile: + \code + $ qbs config profiles.myprofile.preferences.ignoreSystemSearchPaths true + \endcode + You can use the \l{config-ui} command to open the Qbs Settings tool for managing settings in a hierarchical view. @@ -65,6 +81,8 @@ \include cli-options.qdocinc unset \include cli-options.qdocinc export \include cli-options.qdocinc import + \include cli-options.qdocinc config-user + \include cli-options.qdocinc config-system \include cli-options.qdocinc help \section1 Parameters diff --git a/doc/reference/cli/tools/cli-setup-qt.qdoc b/doc/reference/cli/tools/cli-setup-qt.qdoc index 9673286b3..1cf961d0d 100644 --- a/doc/reference/cli/tools/cli-setup-qt.qdoc +++ b/doc/reference/cli/tools/cli-setup-qt.qdoc @@ -36,8 +36,8 @@ \section1 Synopsis \code - qbs setup-qt [--settings-dir <directory>] --detect - qbs setup-qt [--settings-dir <directory>] <path to qmake> <profile name> + qbs setup-qt [--settings-dir <directory>] [--system] --detect + qbs setup-qt [--settings-dir <directory>] [--system] <path to qmake> <profile name> \endcode \section1 Description @@ -56,6 +56,7 @@ \include cli-options.qdocinc detect-qt-versions \include cli-options.qdocinc settings-dir + \include cli-options.qdocinc setup-tools-system \include cli-options.qdocinc help \section1 Examples diff --git a/doc/reference/cli/tools/cli-setup-toolchains.qdoc b/doc/reference/cli/tools/cli-setup-toolchains.qdoc index 15490cc2a..af3b25069 100644 --- a/doc/reference/cli/tools/cli-setup-toolchains.qdoc +++ b/doc/reference/cli/tools/cli-setup-toolchains.qdoc @@ -36,8 +36,8 @@ \section1 Synopsis \code - qbs setup-toolchains [--settings-dir <directory>] --detect - qbs setup-toolchains [--settings-dir <directory>] [--type <toolchain type>] + qbs setup-toolchains [--settings-dir <directory>] [--system] --detect + qbs setup-toolchains [--settings-dir <directory>] [--system] [--type <toolchain type>] <compiler path> <profile name> \endcode @@ -57,6 +57,7 @@ \section1 Options \include cli-options.qdocinc settings-dir + \include cli-options.qdocinc setup-tools-system \include cli-options.qdocinc detect-toolchains \include cli-options.qdocinc type \include cli-options.qdocinc help |