diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 16:16:08 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 16:16:08 +0200 |
commit | acc94a42cd9c31ac68e063edc1caada4251d12b0 (patch) | |
tree | 19a4816cf3972b3d16235ed601788193fe0f20df /examples/qml | |
parent | 4c94a3ca55e82ade19ff5d4ab361d40e6252f2da (diff) | |
parent | 2223f1ae293c2aedf4759564185f74b782395459 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc
examples/quick/accessibility/doc/src/accessibility.qdoc
examples/quick/animation/doc/src/animation.qdoc
examples/quick/canvas/doc/src/canvas.qdoc
examples/quick/draganddrop/doc/src/draganddrop.qdoc
examples/quick/imageelements/doc/src/imageelements.qdoc
examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
examples/quick/localstorage/doc/src/localstorage.qdoc
examples/quick/mousearea/doc/src/mousearea.qdoc
examples/quick/particles/affectors/doc/src/affectors.qdoc
examples/quick/particles/customparticle/doc/src/customparticle.qdoc
examples/quick/particles/emitters/doc/src/emitters.qdoc
examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
examples/quick/particles/system/doc/src/system.qdoc
examples/quick/positioners/doc/src/positioners.qdoc
examples/quick/righttoleft/doc/src/righttoleft.qdoc
examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
examples/quick/threading/doc/src/threading.qdoc
examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
examples/quick/views/doc/src/views.qdoc
Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0
Diffstat (limited to 'examples/qml')
-rw-r--r-- | examples/qml/dynamicscene/doc/src/dynamicscene.qdoc | 2 | ||||
-rw-r--r-- | examples/qml/i18n/doc/src/i18n.qdoc | 2 | ||||
-rw-r--r-- | examples/qml/plugins/doc/src/qmlpluginex.qdoc | 2 | ||||
-rw-r--r-- | examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/qml/dynamicscene/doc/src/dynamicscene.qdoc b/examples/qml/dynamicscene/doc/src/dynamicscene.qdoc index 7a62f82ed9..77cb5959b9 100644 --- a/examples/qml/dynamicscene/doc/src/dynamicscene.qdoc +++ b/examples/qml/dynamicscene/doc/src/dynamicscene.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! \title QML Example - Dynamic Scene - \example qml/dynamicscene + \example dynamicscene \brief This example demonstrates creating components dynamically. \image qml-dynamicscene-example.png */ diff --git a/examples/qml/i18n/doc/src/i18n.qdoc b/examples/qml/i18n/doc/src/i18n.qdoc index a342e99ea5..39f2bf9a08 100644 --- a/examples/qml/i18n/doc/src/i18n.qdoc +++ b/examples/qml/i18n/doc/src/i18n.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! \title QML Examples - Internationalization - \example qml/i18n + \example i18n \image qml-i18n-example.png \brief This is an internationalization example diff --git a/examples/qml/plugins/doc/src/qmlpluginex.qdoc b/examples/qml/plugins/doc/src/qmlpluginex.qdoc index 895030418a..5ea7237c8f 100644 --- a/examples/qml/plugins/doc/src/qmlpluginex.qdoc +++ b/examples/qml/plugins/doc/src/qmlpluginex.qdoc @@ -27,7 +27,7 @@ /*! \title QML Plugin Example - \example qml/plugins + \example plugins \brief This example creates a C++ plugin extension by subclassing QQmlExtensionPlugin. diff --git a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc index 5167ecfad1..db0b9e0a03 100644 --- a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc +++ b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! \title Qt Quick Examples - XMLHttpRequest - \example qml/xmlhttprequest + \example xmlhttprequest \brief This is a collection of XMLHttpRequest examples \image qml-xmlhttprequest-example.png |