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-index.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-index.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-index.qdoc | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 81318cde..f64901d5 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -35,46 +35,11 @@ to build complete interfaces in Qt Quick. The module was introduced in Qt 5.7. + \image qtquickcontrols2-styles.png + Qt Quick Controls 2 comes with a selection customizable styles. See \l {Styling Qt Quick Controls 2} for more details. - \raw HTML - <table style="background:transparent; border:0px" width="66%"> - <tr> - <td style="border:0px; padding-right:25px;"> - <a href="qtquickcontrols2-default.html"> - <img src="images/qtquickcontrols2-default.png" alt="Default" width="100%"/> - </a> - </td> - <td style="border:0px"> - <a href="qtquickcontrols2-material.html"> - <img src="images/qtquickcontrols2-material.png" alt="Material" width="100%"/> - </a> - </td> - </tr> - <tr> - <td style="border:0px">Default Style</td> - <td style="border:0px">Material Style</td> - </tr> - <tr> - <td style="border:0px; padding-top:45px; padding-right:25px;"> - <a href="qtquickcontrols2-fusion.html"> - <img src="images/qtquickcontrols2-fusion.png" alt="Fusion" width="100%"/> - </a> - </td> - <td style="border:0px; padding-top:45px; "> - <a href="qtquickcontrols2-universal.html"> - <img src="images/qtquickcontrols2-universal.png" alt="Universal" width="100%"/> - </a> - </td> - </tr> - <tr> - <td style="border:0px">Fusion Style</td> - <td style="border:0px">Universal Style</td> - </tr> - </table> - \endraw - \section1 Prerequisites The \l{Qt Quick Controls 2 QML Types}{QML types} can be imported into your |