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

3 files changed, 10 insertions, 9 deletions

diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index b0676218cd..d9b4e03818 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -5,6 +5,7 @@ description             = Qt Quick Reference Documentation
 url                     = http://qt-project.org/doc/qt-$QT_VER/qtquick-index.html
 version                 = $QT_VERSION
 
+examplesinstallpath     = quick
 
 qhp.projects            = QtQuick
 
@@ -39,7 +40,7 @@ headerdirs  += ..
 
 sourcedirs  += ..
 
-exampledirs +=  ../../../examples/ \
+exampledirs +=  ../../../examples/quick \
                 snippets
 
 
diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc
index f670e3a323..966233c371 100644
--- a/src/quick/doc/src/advtutorial.qdoc
+++ b/src/quick/doc/src/advtutorial.qdoc
@@ -71,7 +71,7 @@ directory.
 \previouspage QML Advanced Tutorial
 \nextpage QML Advanced Tutorial 2 - Populating the Game Canvas
 
-\example quick/tutorials/samegame/samegame1
+\example tutorials/samegame/samegame1
 
 \section2 Creating the application screen
 
@@ -141,7 +141,7 @@ types to get started. Next, we will populate the game canvas with some blocks.
 \previouspage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
 \nextpage QML Advanced Tutorial 3 - Implementing the Game Logic
 
-\example quick/tutorials/samegame/samegame2
+\example tutorials/samegame/samegame2
 
 \section2 Generating the blocks in JavaScript
 
@@ -217,7 +217,7 @@ Now, we have a screen of blocks, and we can begin to add the game mechanics.
 \previouspage QML Advanced Tutorial 2 - Populating the Game Canvas
 \nextpage QML Advanced Tutorial 4 - Finishing Touches
 
-\example quick/tutorials/samegame/samegame3
+\example tutorials/samegame/samegame3
 
 \section2 Making a playable game
 
@@ -305,7 +305,7 @@ until the next chapter - where your application becomes alive!
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 3 - Implementing the Game Logic
 
-\example quick/tutorials/samegame/samegame4
+\example tutorials/samegame/samegame4
 
 \section2 Adding some flair
 
diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index 9c224f8642..daa14a6973 100644
--- a/src/quick/doc/src/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -57,7 +57,7 @@ directory.
 \previouspage QML Dynamic View Ordering Tutorial
 \nextpage QML Dynamic View Ordering Tutorial 2 - Dragging View Items
 
-\example quick/tutorials/dynamicview/dynamicview1
+\example tutorials/dynamicview/dynamicview1
 
 We begin our application by defining a ListView, a model which will provide data to the view, and a
 delegate which provides a template for constructing items in the view.
@@ -94,7 +94,7 @@ The second part of the application is the ListView itself to which we bind the m
 \previouspage QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate
 \nextpage QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
 
-\example quick/tutorials/dynamicview/dynamicview2
+\example tutorials/dynamicview/dynamicview2
 
 Now that we have a visible list of items we want to be able to interact with them. We'll start
 by extending the delegate so the visible content can be dragged up and down the screen.  The
@@ -139,7 +139,7 @@ so that is above other items in the stacking order and isn't obscured as it is d
 \previouspage QML Dynamic View Ordering Tutorial 2 - Dragging View Items
 \nextpage QML Dynamic View Ordering Tutorial 4 - Sorting Items
 
-\example quick/tutorials/dynamicview/dynamicview3
+\example tutorials/dynamicview/dynamicview3
 
 The next step in our application to move items within the list as they're dragged so that we
 can re-order the list.  To achieve this we introduce three new types to our application;
@@ -192,7 +192,7 @@ property of the view and bind the \l {QtQuick2::VisualDataModel::model}{model} a
 \contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
 
-\example quick/tutorials/dynamicview/dynamicview4
+\example tutorials/dynamicview/dynamicview4
 
 Drag and drop isn't the only way items in a view can be re-ordered, using a VisualDataModel it is
 also possible to sort items based on model data.  To do that we extend our VisualDataModel instance