diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:18:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-01 13:19:21 +0200 |
| commit | 14e08bafc88824f3d16602b04b5e60ae8c4005b0 (patch) | |
| tree | 47a831782fe60e26e6bba7ff8e5a0c3ac0a81c42 /src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc | |
| parent | 2ebb1fdcafaba9d3b0e7fbb42ccd5c3ffde38fbf (diff) | |
| parent | ceaf6177a8be6db22e629ff05a625e278025b071 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Comparing colors in tst_material.qml works fine now.
Conflicts:
examples/quickcontrols2/gallery/qtquickcontrols2.conf
tests/auto/material/data/tst_material.qml
Task-number: QTBUG-53556
Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index ac2c051d..fbfca8d1 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -32,7 +32,7 @@ The Universal Style is based on the Microsoft Universal Design Guidelines. \l {detailed-desc-universal}{More...} - \styleimport {QtQuick.Controls.Universal 2.0} + \styleimport {QtQuick.Controls.Universal 2.0} {Qt 5.7} \section1 Attached Properties @@ -43,6 +43,12 @@ \li \l {theme-attached-prop}{\b theme} : enumeration \endlist + \section1 Attached Methods + + \list + \li color \l {color-attached-method}{\b color}(enumeration predefined) + \endlist + \section1 Detailed Description \target detailed-desc-universal @@ -159,6 +165,8 @@ style-specific tweaks can be applied without creating a hard dependency to a style. + \b {See also} \l {Default Style}, \l {Material Style} + \section1 Attached Property Documentation \styleproperty {Universal.accent} {color} {accent-attached-prop} @@ -225,6 +233,24 @@ \endstyleproperty + \section1 Attached Method Documentation + + \stylemethod {color} {color} {enumeration} {predefined} {color-attached-method} + \target color-attached-method + This attached method returns the color value of the specified \l {pre-defined colors} + {pre-defined color}. + + \qml + import QtQuick 2.0 + import QtQuick.Controls.Universal 2.0 + + Rectangle { + color: Universal.color(Universal.Red) + } + \endqml + + \endstylemethod + \section1 Related Information \list |