From 86dacdcbbdcfc503715fb077a4b32ec2d62b5227 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 6 Nov 2014 08:45:38 +0100 Subject: 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 Reviewed-by: Venugopal Shivashankar Reviewed-by: Martin Smith --- src/controls/doc/images/qtquickcontrols-android.png | Bin 21393 -> 0 bytes .../images/qtquickcontrols-example-gallery-android.png | Bin 0 -> 26306 bytes .../doc/images/qtquickcontrols-example-gallery-osx.png | Bin 0 -> 24118 bytes .../doc/images/qtquickcontrols-example-gallery.png | Bin 34070 -> 0 bytes src/controls/doc/src/qtquickcontrols-examples.qdoc | 17 ++++++++++++++++- .../doc/src/qtquickcontrols-platformnotes.qdoc | 2 +- 6 files changed, 17 insertions(+), 2 deletions(-) delete mode 100644 src/controls/doc/images/qtquickcontrols-android.png create mode 100644 src/controls/doc/images/qtquickcontrols-example-gallery-android.png create mode 100644 src/controls/doc/images/qtquickcontrols-example-gallery-osx.png delete mode 100644 src/controls/doc/images/qtquickcontrols-example-gallery.png diff --git a/src/controls/doc/images/qtquickcontrols-android.png b/src/controls/doc/images/qtquickcontrols-android.png deleted file mode 100644 index 8877c09cd..000000000 Binary files a/src/controls/doc/images/qtquickcontrols-android.png and /dev/null differ diff --git a/src/controls/doc/images/qtquickcontrols-example-gallery-android.png b/src/controls/doc/images/qtquickcontrols-example-gallery-android.png new file mode 100644 index 000000000..11ba2cc0c Binary files /dev/null and b/src/controls/doc/images/qtquickcontrols-example-gallery-android.png differ diff --git a/src/controls/doc/images/qtquickcontrols-example-gallery-osx.png b/src/controls/doc/images/qtquickcontrols-example-gallery-osx.png new file mode 100644 index 000000000..492dc36e5 Binary files /dev/null and b/src/controls/doc/images/qtquickcontrols-example-gallery-osx.png differ diff --git a/src/controls/doc/images/qtquickcontrols-example-gallery.png b/src/controls/doc/images/qtquickcontrols-example-gallery.png deleted file mode 100644 index a88eab793..000000000 Binary files a/src/controls/doc/images/qtquickcontrols-example-gallery.png and /dev/null differ diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index 8b8c14699..5ff2b27be 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 +
+ +
+ \endraw + \image qtquickcontrols-example-gallery-osx.png + \caption OS X + \raw HTML + + \endraw + \image qtquickcontrols-example-gallery-android.png + \caption Android - Nexus 5 + \raw HTML +
+ \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 70f1a1bb5..092dc45d2 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. -- cgit v1.2.3