diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-08-19 16:08:41 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-08-19 14:12:09 +0000 |
| commit | ccc482a2de8710a548c080e441e0658ae50fcb2e (patch) | |
| tree | 19b704fcdc90753843dd37a4e3185cd08ad4af0d | |
| parent | 6df3a9faa1845fd78996f376e6f885d1a09cfa42 (diff) | |
Document that style attributes set in QML have precedence over settings
Change-Id: I88fbebfc672d4c8d398a45b5dfe0c61fa307a9e7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-material.qdoc | 3 | ||||
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index df57bcc9..9416a505 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -134,7 +134,8 @@ In addition to specifying the attributes in QML, it is also possible to specify them via environment variables or in a \l {qtquickcontrols2-conf} - {configuration file}. + {configuration file}. Attributes specified in QML take precedence over all + other methods. \section3 Environment Variables diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 648193b0..2e9a7c60 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -134,7 +134,8 @@ In addition to specifying the attributes in QML, it is also possible to specify them via environment variables or in a \l {qtquickcontrols2-conf} - {configuration file}. + {configuration file}. Attributes specified in QML take precedence over all + other methods. \section3 Environment Variables |