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

1 files changed, 10 insertions, 10 deletions

diff --git a/examples/quick/doc/src/qml-extending.qdoc b/examples/quick/doc/src/qml-extending.qdoc
index 0b032c60fc..ee2dd06623 100644
--- a/examples/quick/doc/src/qml-extending.qdoc
+++ b/examples/quick/doc/src/qml-extending.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\example qml/referenceexamples/adding
+\example referenceexamples/adding
 \title Extending QML - Adding Types Example
 \brief Exporting C++ Classes
 \ingroup qmlextendingexamples
@@ -63,7 +63,7 @@ loads and runs the QML snippet shown at the beginning of this page.
 */
 
 /*!
-\example qml/referenceexamples/properties
+\example referenceexamples/properties
 \title Extending QML - Object and List Property Types Example
 \brief Exporting C++ Properties
 \ingroup qmlextendingexamples
@@ -113,7 +113,7 @@ loads and runs the QML snippet shown at the beginning of this page.
 */
 
 /*!
-\example qml/referenceexamples/coercion
+\example referenceexamples/coercion
 \title Extending QML - Inheritance and Coercion Example
 \brief C++ Inheritance and Coercion
 \ingroup qmlextendingexamples
@@ -178,7 +178,7 @@ loads and runs the QML snippet shown at the beginning of this page.
 */
 
 /*!
-\example qml/referenceexamples/default
+\example referenceexamples/default
 \title Extending QML - Default Property Example
 \brief Default Property
 \ingroup qmlextendingexamples
@@ -216,7 +216,7 @@ loads and runs the QML snippet shown at the beginning of this page.
 */
 
 /*!
-\example qml/referenceexamples/grouped
+\example referenceexamples/grouped
 \title Extending QML - Grouped Properties Example
 \brief Grouped Properties
 \ingroup qmlextendingexamples
@@ -232,7 +232,7 @@ This example builds on:
 */
 
 /*!
-\example qml/referenceexamples/attached
+\example referenceexamples/attached
 \title Extending QML - Attached Properties Example
 \brief Attached Properties
 \ingroup qmlextendingexamples
@@ -249,7 +249,7 @@ This example builds on:
 */
 
 /*!
-\example qml/referenceexamples/signal
+\example referenceexamples/signal
 \title Extending QML - Signal Support Example
 \brief Signal Support
 \ingroup qmlextendingexamples
@@ -267,7 +267,7 @@ This example builds on:
 */
 
 /*!
-\example qml/referenceexamples/methods
+\example referenceexamples/methods
 \title Extending QML - Methods Example
 \brief Methods Support
 \ingroup qmlextendingexamples
@@ -283,7 +283,7 @@ This example builds on:
 */
 
 /*!
-\example qml/referenceexamples/valuesource
+\example referenceexamples/valuesource
 \title Extending QML - Property Value Source Example
 \brief Property Value Source
 \ingroup qmlextendingexamples
@@ -302,7 +302,7 @@ This example builds on:
 */
 
 /*!
-\example qml/referenceexamples/binding
+\example referenceexamples/binding
 \title Extending QML - Binding Example
 \brief Binding
 \ingroup qmlextendingexamples