From ccc482a2de8710a548c080e441e0658ae50fcb2e Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 19 Aug 2016 16:08:41 +0200 Subject: Document that style attributes set in QML have precedence over settings Change-Id: I88fbebfc672d4c8d398a45b5dfe0c61fa307a9e7 Reviewed-by: J-P Nurmi --- src/imports/controls/doc/src/qtquickcontrols2-material.qdoc | 3 ++- src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/doc/src') 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 -- cgit v1.2.3