diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-03-20 17:57:07 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 05:49:28 +0200 |
commit | 1025b77fe09f010be71ac460475da144e742bf09 (patch) | |
tree | 4e3496b305895948c2d16abe6a6f30b363153fa0 /examples/quick | |
parent | a3d4c97c5fb28599e007116fec679b16656df512 (diff) |
Tidy up examples documentation
Add missing doc images, move documentation into examples directory, and
update example doc references to the new locations (quick/qml instead of
declarative or qtquick).
Change-Id: I67a9302f2b451b8bf30f4ca6b625f54b240da429
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'examples/quick')
-rw-r--r-- | examples/quick/accessibility/accessibility.qml | 2 | ||||
-rw-r--r-- | examples/quick/animation/animation.qml | 2 | ||||
-rw-r--r-- | examples/quick/canvas/canvas.qml | 1 | ||||
-rw-r--r-- | examples/quick/draganddrop/draganddrop.qml | 2 | ||||
-rw-r--r-- | examples/quick/imageelements/imageelements.qml | 2 | ||||
-rw-r--r-- | examples/quick/positioners/positioners-transitions.qml | 4 | ||||
-rw-r--r-- | examples/quick/righttoleft/righttoleft.qml | 2 | ||||
-rw-r--r-- | examples/quick/shadereffects/shadereffects.qml | 2 | ||||
-rw-r--r-- | examples/quick/text/text.qml | 2 | ||||
-rw-r--r-- | examples/quick/threading/threading.qml | 2 | ||||
-rw-r--r-- | examples/quick/touchinteraction/touchinteraction.qml | 2 |
11 files changed, 12 insertions, 11 deletions
diff --git a/examples/quick/accessibility/accessibility.qml b/examples/quick/accessibility/accessibility.qml index e987561bb1..5e4b0f8dcd 100644 --- a/examples/quick/accessibility/accessibility.qml +++ b/examples/quick/accessibility/accessibility.qml @@ -44,7 +44,7 @@ import "content" /*! \title QtQuick Examples - Accessibility - \example qtquick/accessibility + \example quick/accessibility \brief This example has accessible buttons. */ diff --git a/examples/quick/animation/animation.qml b/examples/quick/animation/animation.qml index bca68457d9..f478cb713b 100644 --- a/examples/quick/animation/animation.qml +++ b/examples/quick/animation/animation.qml @@ -43,7 +43,7 @@ import "../../shared" as Examples /*! \title QtQuick Examples - Animation - \example qtquick/animation + \example quick/animation \brief This is a collection of QML Animation examples. \image qml-animations-example.png diff --git a/examples/quick/canvas/canvas.qml b/examples/quick/canvas/canvas.qml index bdb58f4c78..cf3c37a4c3 100644 --- a/examples/quick/canvas/canvas.qml +++ b/examples/quick/canvas/canvas.qml @@ -45,6 +45,7 @@ import "../../shared" as Examples \title QtQuick Examples - Canvas \example quick/canvas \brief This is a collection of QML Canvas examples. + \image qml-canvas-example.png This is a collection of small QML examples relating to Canvas item. Each example is a small QML file emphasizing a particular element or feature. diff --git a/examples/quick/draganddrop/draganddrop.qml b/examples/quick/draganddrop/draganddrop.qml index 88e6d5e021..9f56177f23 100644 --- a/examples/quick/draganddrop/draganddrop.qml +++ b/examples/quick/draganddrop/draganddrop.qml @@ -43,7 +43,7 @@ import "../../shared" as Examples /*! \title QtQuick Examples - Drag and Drop - \example qtquick/draganddrop + \example quick/draganddrop \brief This is a collection of QML drag and drop examples \image qml-draganddrop-example.png diff --git a/examples/quick/imageelements/imageelements.qml b/examples/quick/imageelements/imageelements.qml index bb23ef6979..adfa43a659 100644 --- a/examples/quick/imageelements/imageelements.qml +++ b/examples/quick/imageelements/imageelements.qml @@ -43,7 +43,7 @@ import "../../shared" /*! \title QML Examples - Image Elements - \example declarative/imageelements + \example quick/imageelements \brief This is a collection of QML examples \image qml-imageelements-example.png diff --git a/examples/quick/positioners/positioners-transitions.qml b/examples/quick/positioners/positioners-transitions.qml index 6081c9f8a8..f1b61c1740 100644 --- a/examples/quick/positioners/positioners-transitions.qml +++ b/examples/quick/positioners/positioners-transitions.qml @@ -43,12 +43,12 @@ import QtQuick 2.0 Rectangle { id: page width: 320; height: 480 - property int effectiveOpacity: 1.0 + property real effectiveOpacity: 1.0 Timer { interval: 2000 running: true repeat: true - onTriggered: effectiveOpacity = (effectiveOpacity == 1.0 ? 0.0 : 1.0) + onTriggered: effectiveOpacity = (effectiveOpacity == 1.0 ? 0.0 : 1.0); } Column { diff --git a/examples/quick/righttoleft/righttoleft.qml b/examples/quick/righttoleft/righttoleft.qml index 6561595603..b95f671d95 100644 --- a/examples/quick/righttoleft/righttoleft.qml +++ b/examples/quick/righttoleft/righttoleft.qml @@ -43,7 +43,7 @@ import "../../shared" as Examples /*! \title QtQuick Examples - Right to Left - \example qtquick/Right to Left + \example quick/righttoleft \brief This is a collection of QML Right to Left examples. \image qml-righttoleft-example.png diff --git a/examples/quick/shadereffects/shadereffects.qml b/examples/quick/shadereffects/shadereffects.qml index 25efa5f4ed..4b3bb2a5e2 100644 --- a/examples/quick/shadereffects/shadereffects.qml +++ b/examples/quick/shadereffects/shadereffects.qml @@ -48,7 +48,7 @@ Rectangle { height: 480 /*! \title QML Examples - Shader Effects - \example declarative/shadereffects + \example quick/shadereffects \image qml-shadereffects-example.png \brief This is a shader effects example diff --git a/examples/quick/text/text.qml b/examples/quick/text/text.qml index e9c40773c9..e8be93cb69 100644 --- a/examples/quick/text/text.qml +++ b/examples/quick/text/text.qml @@ -42,7 +42,7 @@ import QtQuick 2.0 import "../../shared" /*! \title QML Examples - Text - \example declarative/text + \example quick/text \brief This is a collection of QML examples \image qml-text-example.png diff --git a/examples/quick/threading/threading.qml b/examples/quick/threading/threading.qml index 7ba8b8f70d..b96c6975ac 100644 --- a/examples/quick/threading/threading.qml +++ b/examples/quick/threading/threading.qml @@ -43,7 +43,7 @@ import "../../shared" as Examples /*! \title QtQuick Examples - Threading - \example qtquick/threading + \example quick/threading \brief This is a collection of QML Multithreading examples. \image qml-threading-example.png diff --git a/examples/quick/touchinteraction/touchinteraction.qml b/examples/quick/touchinteraction/touchinteraction.qml index 0be625a160..e64c145714 100644 --- a/examples/quick/touchinteraction/touchinteraction.qml +++ b/examples/quick/touchinteraction/touchinteraction.qml @@ -43,7 +43,7 @@ import "../../shared" /*! \title QtQuick Examples - Touch Interaction - \example qtquick/touchinteraction + \example quick/touchinteraction \brief This is a collection of QML Touch Interaction examples. \image qml-touchinteraction-example.png |