diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-26 14:10:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-26 14:13:35 +0200 |
| commit | 11b066beb45e7da084c6f792cf9421d48d4b40bf (patch) | |
| tree | 0a27017508682b812b9fa533a3cab95aeb3c33c6 /src/imports/controls/doc/src | |
| parent | f1eef22d0d1ddcc2ee48e45e522788eb97f429b0 (diff) | |
| parent | d1efdcd2beac4d40d06ac7258b4d84e4376ab9d6 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/quickcontrols2/gallery/gallery.qrc
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
src/quicktemplates2/qquickstackview_p.cpp
src/quicktemplates2/qquickstackview_p_p.h
tests/auto/controls/data/tst_stackview.qml
Change-Id: If451fe0e5653572d305b4de90a6d5cb878463e8d
Diffstat (limited to 'src/imports/controls/doc/src')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc index 1a1b7b3c..a1c4eeef 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc @@ -135,9 +135,10 @@ The configuration file can specify the preferred style (may be overridden by either of the methods described earlier) and certain style-specific attributes. The following example specifies that the preferred style is the Material style. Furthermore, when the - application is run with the Material style, its theme is light and the accent color is - brown. However, if the application is run with the Universal style instead, the accent - color is red and the appropriate theme is chosen based on the system theme colors. + application is run with the Material style, its theme is light and the accent and primary + colors are teal and blue grey, respectively. However, if the application is run with the + Universal style instead, the accent color is red and the appropriate theme is chosen based + on the system theme colors. \code [Controls] @@ -149,7 +150,8 @@ [Material] Theme=Light - Accent=Brown + Accent=Teal + Primary=BlueGrey \endcode In order to make it possible for Qt Quick Controls 2 to find the configuration file, |