diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2012-11-30 12:30:11 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-30 15:30:17 +0100 |
commit | 6daa13b55a0e6685d7397e93e4c37c739ede9268 (patch) | |
tree | be25bbc11d2bedda518bee502a445c615e1ff90d /src/quick/doc/src | |
parent | d7996b7637ae0bbc261c32b4f93dd07e66eeda7a (diff) |
Fix example lists for Qt Quick
Snippets are fixed, the extending-examples are moved from
QtDoc, groups are used to generate the lists and I've removed
some unrelated stuff from the list of Qt Quick examples.
Change-Id: I347b6fa8a29b1cede1164fa858488f34507e1a17
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/doc/src')
-rw-r--r-- | src/quick/doc/src/examples.qdoc | 30 | ||||
-rw-r--r-- | src/quick/doc/src/tutorial.qdoc | 6 |
2 files changed, 13 insertions, 23 deletions
diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc index b82911e6db..c64664da11 100644 --- a/src/quick/doc/src/examples.qdoc +++ b/src/quick/doc/src/examples.qdoc @@ -46,26 +46,16 @@ Some of these code samples have a corresponding \l{qtquick-tutorials}{tutorial}. The Qt Quick features are covered in the \l {qtquick-overviews}{main page}. This set of code samples are part of the collection of \l{Qt Examples}. -\div {class="threecolumn_area"} - \div {class="heading"} - QML Examples - \enddiv - Code samples demonstrate a general use for QML features. Some showcase - how elements or properties can be used in an application. - \li \l{quick/keyinteraction}{Keyboard Focus} - \li \l{quick/mousearea}{MouseArea} - \li \l{quick/animation}{Animations} - \li \l{quick/positioners}{Positioners} - \li \l{quick/righttoleft}{Right to Left} - \li \l{quick/modelviews}{Model Views} - \li \l{quick/imageelements}{Image Elements} - \li \l{localstorage}{SQL Local Storage} - \li \l{qml/xmlhttprequest}{XmlHttpRequest} - \li \l{qml/i18n}{Translation} - \li \l{quick/threading}{Threading} - \li \l{quick/shadereffects}{Shader Effects} - \endlist -\enddiv +\annotatedlist{qtquickexamples} + +The following examples show how a QML-based user interface can be combined with C++ +code using the \l{Qt Qml} Module. + +\annotatedlist{qmlextendingexamples} + +*/ + +/* \div {class="threecolumn_area"} \div {class="heading"} QDeclarative Examples diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc index 75c253c8c2..67951b0abd 100644 --- a/src/quick/doc/src/tutorial.qdoc +++ b/src/quick/doc/src/tutorial.qdoc @@ -200,11 +200,11 @@ We want our text to move to the bottom of the screen, rotate and become red when Here is the QML code: -\snippet examples/tutorials/helloworld/tutorial3.qml 0 +\snippet tutorials/helloworld/tutorial3.qml 0 \section1 Walkthrough -\snippet examples/tutorials/helloworld/tutorial3.qml 2 +\snippet tutorials/helloworld/tutorial3.qml 2 First, we create a new \e down state for our text element. This state will be activated when the \l MouseArea is pressed, and deactivated when it is released. @@ -213,7 +213,7 @@ The \e down state includes a set of property changes from our implicit \e {defau (the items as they were initially defined in the QML). Specifically, we set the \c y property of the text to \c 160, the rotation to \c 180 and the \c color to red. -\snippet examples/tutorials/helloworld/tutorial3.qml 3 +\snippet tutorials/helloworld/tutorial3.qml 3 Because we don't want the text to appear at the bottom instantly but rather move smoothly, we add a transition between our two states. |