From f314fd4327167dd6af88f9b7050b34144d75241d Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Tue, 30 Apr 2013 23:38:07 +0800 Subject: [PATCH] Doc: Move full apps from "qtquickexamples" to "qtquickdemos" "qtquickexamples" is for illustrating code usage; "qtquickdemos" is for showcasing fully-functional apps. Renamed titles and screenshots to match the other demos. Also, attempt to make the descriptions sound more interesting. Change-Id: I2fb43c5d32f24159cd39564576d4ebd76b2cbeaa Reviewed-by: Alan Alpert Reviewed-by: Jerome Pasion --- ...ml-calqlatr-demo-small.png => qtquick-demo-calqlatr.png} | Bin examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc | 10 ++++------ ...xample-small.png => qtquick-demo-photosurface-small.png} | Bin examples/quick/demos/photosurface/doc/src/photosurface.qdoc | 8 ++++---- 4 files changed, 8 insertions(+), 10 deletions(-) rename examples/quick/demos/calqlatr/doc/images/{qml-calqlatr-demo-small.png => qtquick-demo-calqlatr.png} (100%) rename examples/quick/demos/photosurface/doc/images/{qml-photosurface-example-small.png => qtquick-demo-photosurface-small.png} (100%) diff --git a/examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png b/examples/quick/demos/calqlatr/doc/images/qtquick-demo-calqlatr.png similarity index 100% rename from examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png rename to examples/quick/demos/calqlatr/doc/images/qtquick-demo-calqlatr.png diff --git a/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc index d812da4..7217c7d 100644 --- a/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc +++ b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc @@ -26,13 +26,11 @@ ****************************************************************************/ /*! - \title QML Demo - Calqlatr + \title Qt Quick Demo - Calqlatr + \ingroup qtquickdemos \example demos/calqlatr - \brief This is an example calculator written in QML. - \image qml-calqlatr-demo-small.png - \ingroup qtquickexamples - - This demo implements a simple calculator app, designed for portrait devices. + \brief A simple calculator app, designed for portrait devices. + \image qtquick-demo-calqlatr.png This app has the logic implemented in Javascipt and the appearance implemented in QML. */ diff --git a/examples/quick/demos/photosurface/doc/images/qml-photosurface-example-small.png b/examples/quick/demos/photosurface/doc/images/qtquick-demo-photosurface-small.png similarity index 100% rename from examples/quick/demos/photosurface/doc/images/qml-photosurface-example-small.png rename to examples/quick/demos/photosurface/doc/images/qtquick-demo-photosurface-small.png diff --git a/examples/quick/demos/photosurface/doc/src/photosurface.qdoc b/examples/quick/demos/photosurface/doc/src/photosurface.qdoc index 343acce..48f8e8a 100644 --- a/examples/quick/demos/photosurface/doc/src/photosurface.qdoc +++ b/examples/quick/demos/photosurface/doc/src/photosurface.qdoc @@ -26,11 +26,11 @@ ****************************************************************************/ /*! - \title QML Demo - Photo Surface + \title Qt Quick Demo - Photo Surface + \ingroup qtquickdemos \example demos/photosurface - \brief This is the typical touch photo-shuffling example written in QML. - \image qml-photosurface-example-small.png - \ingroup qtquickexamples + \brief A touch-based app for shuffling photos around a virtual surface. + \image qtquick-demo-photosurface-small.png This example demonstrates how to handle dragging, rotation and pinch zooming within the same item using a PinchArea containing a MouseArea. -- 2.7.4