diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-11-06 08:45:38 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-10 16:07:28 +0100 |
| commit | 86dacdcbbdcfc503715fb077a4b32ec2d62b5227 (patch) | |
| tree | 7edf11d537b03544e49c28945e2a81e57e523ea9 | |
| parent | 27987d0b6ab181205e446e392d7c099c7ea81e94 (diff) | |
| download | qtquickcontrols-86dacdcbbdcfc503715fb077a4b32ec2d62b5227.tar.gz | |
Doc: Update gallery screenshots
To match the updated example. Display a screenshot for both
Android and OS X in the gallery example documentation.
Change-Id: I37e56437bb54248a4d500810c56ce8a8ba15b4d2
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-android.png | bin | 21393 -> 0 bytes | |||
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-gallery-android.png | bin | 0 -> 26306 bytes | |||
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-gallery-osx.png | bin | 0 -> 24118 bytes | |||
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-gallery.png | bin | 34070 -> 0 bytes | |||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-examples.qdoc | 17 | ||||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-platformnotes.qdoc | 2 |
6 files changed, 17 insertions, 2 deletions
diff --git a/src/controls/doc/images/qtquickcontrols-android.png b/src/controls/doc/images/qtquickcontrols-android.png Binary files differdeleted file mode 100644 index 8877c09c..00000000 --- a/src/controls/doc/images/qtquickcontrols-android.png +++ /dev/null diff --git a/src/controls/doc/images/qtquickcontrols-example-gallery-android.png b/src/controls/doc/images/qtquickcontrols-example-gallery-android.png Binary files differnew file mode 100644 index 00000000..11ba2cc0 --- /dev/null +++ b/src/controls/doc/images/qtquickcontrols-example-gallery-android.png diff --git a/src/controls/doc/images/qtquickcontrols-example-gallery-osx.png b/src/controls/doc/images/qtquickcontrols-example-gallery-osx.png Binary files differnew file mode 100644 index 00000000..492dc36e --- /dev/null +++ b/src/controls/doc/images/qtquickcontrols-example-gallery-osx.png diff --git a/src/controls/doc/images/qtquickcontrols-example-gallery.png b/src/controls/doc/images/qtquickcontrols-example-gallery.png Binary files differdeleted file mode 100644 index a88eab79..00000000 --- a/src/controls/doc/images/qtquickcontrols-example-gallery.png +++ /dev/null diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index 8b8c1469..5ff2b27b 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}. diff --git a/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc b/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc index 70f1a1bb..092dc45d 100644 --- a/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc +++ b/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc @@ -37,7 +37,7 @@ Qt 5.4 introduced a native Android style for Qt Quick Controls. - \image qtquickcontrols-android.png + \image qtquickcontrols-example-gallery-android.png \note The Android style requires Android 3.0 (API level 11) or later. |
