diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:04:58 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:04:58 +0100 |
| commit | 71314570d03631f50ab2c262011aba6a572d0ced (patch) | |
| tree | 6d0c663ad313af89efff8e7b0fdafe6a28b19505 /src/controls/doc/src/qtquickcontrols-examples.qdoc | |
| parent | 3704a616dfabb71ebd3ffc64f8efe32931c82a8b (diff) | |
| parent | ea099e341b5f8845be56f81b22e44a8b6cb227a2 (diff) | |
| download | qtquickcontrols-71314570d03631f50ab2c262011aba6a572d0ced.tar.gz | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I4c81a7852e7041328b7cfa320e907cc3cb863f04
Diffstat (limited to 'src/controls/doc/src/qtquickcontrols-examples.qdoc')
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-examples.qdoc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index 4e6fccb0..29c8d2b5 100644 --- a/src/controls/doc/src/qtquickcontrols-examples.qdoc +++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc @@ -40,7 +40,22 @@ \title Qt Quick Controls - Gallery \ingroup qtquickcontrols_examples \brief A collection of components for a classic desktop-style UI. - \image qtquickcontrols-example-gallery.png + + \raw HTML + <div class="table"><table style="background:transparent; border:0px"> + <tr><td style="border:0px"> + \endraw + \image qtquickcontrols-example-gallery-osx.png + \caption OS X + \raw HTML + </td><td style="border:0px"> + \endraw + \image qtquickcontrols-example-gallery-android.png + \caption Android - Nexus 5 + \raw HTML + </td></tr> + </table></div> + \endraw This example project demonstrates the various UI components provided by \l{Qt Quick Controls}. |