diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-08 09:11:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-08 09:11:39 +0200 |
| commit | 38be5b605a844693bb93d24fab8c721bec273003 (patch) | |
| tree | bd8f5271078bca73acb1c33d7ee6f6f5a02b6a59 /src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc | |
| parent | 20d141034b48ae73eee70743dc410d35491cd00f (diff) | |
| parent | a5f8ceee8547c3447675d1c4e70f5706bbd2bd99 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickmenu.cpp
src/quicktemplates2/qquickmenu_p.h
src/quicktemplates2/qquickpopup.cpp
tests/auto/auto.pro
Change-Id: I856a022d38abd84763127539f46ef032ddc53c3d
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index b4fe4dfa..8e88f345 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -57,8 +57,13 @@ The Universal style has been designed to look good on all devices, from phones and tablets to PCs. - \image qtquickcontrols2-universal.png - \caption The Universal style in light and dark themes + \table + \row + \li \image qtquickcontrols2-universal-light.png + \caption The Universal style in light theme + \li \image qtquickcontrols2-universal-dark.png + \caption The Universal style in dark theme + \endtable To run an application with the Universal style, see \l {Using Styles in Qt Quick Controls 2}. @@ -107,7 +112,7 @@ } \endqml \li - \image qtquickcontrols2-universal-dark.png + \image qtquickcontrols2-universal-violet.png \endtable In addition to specifying the attributes in QML, it is also possible to |