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/quick/views | |
| 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/quick/views')
| -rw-r--r-- | examples/quick/views/doc/src/views.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/views/doc/src/views.qdoc b/examples/quick/views/doc/src/views.qdoc index b807ceaead..cc8112f4dd 100644 --- a/examples/quick/views/doc/src/views.qdoc +++ b/examples/quick/views/doc/src/views.qdoc @@ -27,7 +27,7 @@ /*! \title Qt Quick Examples - Views - \example quick/views + \example views \brief This is a collection of QML model/view examples \image qml-modelviews-example.png \ingroup qtquickexamples |