diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:00:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:00:03 +0100 |
| commit | c924a94fb5077028965e2c6343e1bafabc0e69f8 (patch) | |
| tree | f19b3b407731ddc90ef9c018be0a066d15605f38 /src | |
| parent | 937f82c8fe6efa9b22449a5d51f1006da1513c10 (diff) | |
| parent | 83da5b251d06c60a724d10688bd8fcdb15ec4e63 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: I91f8b19e02b7350a2569ab14fe79fe809202e6a8
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc index 9d356686..cab3b6fe 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc @@ -53,6 +53,10 @@ Primary=BlueGrey \endcode + It is possible to specify a custom location for the configuration file with + the \l {Supported Environment Variables in Qt Quick Controls 2} + {QT_QUICK_CONTROLS_CONF} environment variable. + \section1 Controls Section The following values can be specified in a \c Controls section of the |