diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 23:29:11 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-22 06:28:58 +0000 |
| commit | 7e7d6d6c73920e1bc1df31b108280a7f165c74b1 (patch) | |
| tree | 807e5ad7d2a00ef99b1ed26aa0aa5d7afb17be29 /src/imports/controls/doc | |
| parent | 01cbb8231b0d6f589423b05f3c7ef7a3b3e209f2 (diff) | |
Rename env vars (QT_LABS_CONTROLS_XXX -> QT_QUICK_CONTROLS_XXX)
Change-Id: Ie903d3491b03d4ec05dd28462a19ee464331d2a2
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index 86f78bd2..20f5c10e 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -133,26 +133,26 @@ \li Variable \li Description \row - \li \c QT_LABS_CONTROLS_MATERIAL_THEME + \li \c QT_QUICK_CONTROLS_MATERIAL_THEME \li The value can be one of the available \l {theme-attached-prop}{themes}, for example \c "Dark". \row - \li \c QT_LABS_CONTROLS_MATERIAL_ACCENT + \li \c QT_QUICK_CONTROLS_MATERIAL_ACCENT \li The value can be any \l {colorbasictypedocs}{color}, but it is recommended to use one of the \l {Pre-defined Colors}{pre-defined colors}, for example for example \c "Teal". \row - \li \c QT_LABS_CONTROLS_MATERIAL_PRIMARY + \li \c QT_QUICK_CONTROLS_MATERIAL_PRIMARY \li The value can be any \l {colorbasictypedocs}{color}, but it is recommended to use one of the \l {Pre-defined Colors}{pre-defined colors}, for example for example \c "BlueGrey". \row - \li \c QT_LABS_CONTROLS_MATERIAL_FOREGROUND + \li \c QT_QUICK_CONTROLS_MATERIAL_FOREGROUND \li The value can be any \l {colorbasictypedocs}{color}, or one of the \l {Pre-defined Colors}{pre-defined colors}. \row - \li \c QT_LABS_CONTROLS_MATERIAL_BACKGROUND + \li \c QT_QUICK_CONTROLS_MATERIAL_BACKGROUND \li The value can be any \l {colorbasictypedocs}{color}, or one of the \l {Pre-defined Colors}{pre-defined colors}. \endtable diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc index 78680519..08f1a095 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc @@ -82,13 +82,13 @@ \section2 Environment variable - Setting the \c QT_LABS_CONTROLS_STYLE environment variable can be used to set + Setting the \c QT_QUICK_CONTROLS_STYLE environment variable can be used to set a system-wide style preference. It takes precedence over the configuration file mentioned below. The following example runs a Qt Quick Controls 2 application with the Universal style: \code - QT_LABS_CONTROLS_STYLE=universal ./app + QT_QUICK_CONTROLS_STYLE=universal ./app \endcode \section2 Configuration file diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 665f4f6f..26bc5974 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -133,11 +133,11 @@ \li Variable \li Description \row - \li \c QT_LABS_CONTROLS_UNIVERSAL_THEME + \li \c QT_QUICK_CONTROLS_UNIVERSAL_THEME \li The value can be one of the available \l {theme-attached-prop}{themes}, for example \c "Dark". \row - \li \c QT_LABS_CONTROLS_UNIVERSAL_ACCENT + \li \c QT_QUICK_CONTROLS_UNIVERSAL_ACCENT \li The value can be any \l {colorbasictypedocs}{color}, but it is recommended to use one of the pre-defined \l {accent-attached-prop} {accents}, for example \c "Violet". |