diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:50:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:50:52 +0200 |
| commit | 0524ddb9489cd9816fadc330f75efc7b40994013 (patch) | |
| tree | 834607a15e646d416e2512f8f4a05ae222495de5 /src/imports/controls/doc/src | |
| parent | 2568869819863de6b1f303dfe470aedf38b841c3 (diff) | |
| parent | 53c780f15c2d170514f74d949a8165033275bddd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/material/qquickmaterialstyle.cpp
src/imports/controls/universal/qquickuniversalstyle.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquicktooltip.cpp
tests/auto/auto.pro
Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2
Diffstat (limited to 'src/imports/controls/doc/src')
| -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 818ad7fd..74a7ece1 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 db1e2766..cb6ac17e 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 |