summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-03 16:16:08 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-03 16:16:08 +0200
commitacc94a42cd9c31ac68e063edc1caada4251d12b0 (patch)
tree19a4816cf3972b3d16235ed601788193fe0f20df
parent4c94a3ca55e82ade19ff5d4ab361d40e6252f2da (diff)
parent2223f1ae293c2aedf4759564185f74b782395459 (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
-rw-r--r--dist/changes-5.0.245
-rw-r--r--examples/qml/dynamicscene/doc/src/dynamicscene.qdoc2
-rw-r--r--examples/qml/i18n/doc/src/i18n.qdoc2
-rw-r--r--examples/qml/plugins/doc/src/qmlpluginex.qdoc2
-rw-r--r--examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc2
-rw-r--r--examples/quick/accessibility/doc/src/accessibility.qdoc2
-rw-r--r--examples/quick/animation/doc/src/animation.qdoc2
-rw-r--r--examples/quick/canvas/doc/src/canvas.qdoc2
-rw-r--r--examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc2
-rw-r--r--examples/quick/doc/src/qml-extending.qdoc20
-rw-r--r--examples/quick/draganddrop/doc/src/draganddrop.qdoc2
-rw-r--r--examples/quick/imageelements/doc/src/imageelements.qdoc2
-rw-r--r--examples/quick/keyinteraction/doc/src/keyinteraction.qdoc2
-rw-r--r--examples/quick/localstorage/doc/src/localstorage.qdoc2
-rw-r--r--examples/quick/mousearea/doc/src/mousearea.qdoc2
-rw-r--r--examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc2
-rw-r--r--examples/quick/particles/affectors/doc/src/affectors.qdoc2
-rw-r--r--examples/quick/particles/customparticle/doc/src/customparticle.qdoc2
-rw-r--r--examples/quick/particles/emitters/doc/src/emitters.qdoc2
-rw-r--r--examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc2
-rw-r--r--examples/quick/particles/system/doc/src/system.qdoc4
-rw-r--r--examples/quick/positioners/doc/src/positioners.qdoc2
-rw-r--r--examples/quick/righttoleft/doc/src/righttoleft.qdoc2
-rw-r--r--examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc2
-rw-r--r--examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc2
-rw-r--r--examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc2
-rw-r--r--examples/quick/shadereffects/doc/src/shadereffects.qdoc2
-rw-r--r--examples/quick/text/doc/src/text.qdoc2
-rw-r--r--examples/quick/threading/doc/src/threading.qdoc2
-rw-r--r--examples/quick/touchinteraction/doc/src/touchinteraction.qdoc2
-rw-r--r--examples/quick/views/doc/src/views.qdoc2
-rw-r--r--src/qml/doc/qtqml.qdocconf2
-rw-r--r--src/qml/doc/src/cppintegration/extending-tutorial.qdoc12
-rw-r--r--src/quick/doc/qtquick.qdocconf3
-rw-r--r--src/quick/doc/src/advtutorial.qdoc8
-rw-r--r--src/quick/doc/src/dynamicview-tutorial.qdoc8
-rw-r--r--tests/auto/quick/qquickpathview/tst_qquickpathview.cpp2
37 files changed, 104 insertions, 56 deletions
diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 0000000000..d2839fb5f2
--- /dev/null
+++ b/dist/changes-5.0.2
@@ -0,0 +1,45 @@
+Qt 5.0.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0 and 5.0.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+* General *
+****************************************************************************
+
+General Improvements
+--------------------
+
+ - Fix build when Qt is configured with -no-opengl.
+ - Various documentation improvements.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+ - [QTBUG-29138] Strengthen reference to var properties during construction
+ so they can be used even if GC runs while the object is being created.
+ - [QTBUG-29176] Fix crash in PathView when path is empty.
+ - [QTBUG-29560] Fix Text and TextEdit embedding images in RichText mode.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+Qt for Windows
+--------------
+
+ - [QTBUG-28782] Enable sub-pixel anti-aliasing for default builds on Windows.
+
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
diff --git a/examples/quick/accessibility/doc/src/accessibility.qdoc b/examples/quick/accessibility/doc/src/accessibility.qdoc
index 467ae3c4a7..a637383324 100644
--- a/examples/quick/accessibility/doc/src/accessibility.qdoc
+++ b/examples/quick/accessibility/doc/src/accessibility.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - Accessibility
- \example quick/accessibility
+ \example accessibility
\brief This example has accessible buttons.
\ingroup qtquickexamples
diff --git a/examples/quick/animation/doc/src/animation.qdoc b/examples/quick/animation/doc/src/animation.qdoc
index 21ed74a576..064717835d 100644
--- a/examples/quick/animation/doc/src/animation.qdoc
+++ b/examples/quick/animation/doc/src/animation.qdoc
@@ -27,7 +27,7 @@
/*!
\title Qt Quick Examples - Animation
- \example quick/animation
+ \example animation
\brief This is a collection of QML Animation examples.
\image qml-animations-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/canvas/doc/src/canvas.qdoc b/examples/quick/canvas/doc/src/canvas.qdoc
index 5c694c5464..638d25d83f 100644
--- a/examples/quick/canvas/doc/src/canvas.qdoc
+++ b/examples/quick/canvas/doc/src/canvas.qdoc
@@ -27,7 +27,7 @@
/*!
\title Qt Quick Examples - Canvas
- \example quick/canvas
+ \example canvas
\brief This is a collection of QML Canvas examples.
\image qml-canvas-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc
index 9e2dc01667..60a9725e53 100644
--- a/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc
+++ b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc
@@ -27,7 +27,7 @@
/*!
\title QML Demo - Calqlatr
- \example quick/demos/calqlatr
+ \example demos/calqlatr
\brief This is an example calculator written in QML.
\image qml-calqlatr-demo-small.png
\ingroup qmldemos
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
diff --git a/examples/quick/draganddrop/doc/src/draganddrop.qdoc b/examples/quick/draganddrop/doc/src/draganddrop.qdoc
index 67621031f9..381fdd1299 100644
--- a/examples/quick/draganddrop/doc/src/draganddrop.qdoc
+++ b/examples/quick/draganddrop/doc/src/draganddrop.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - Drag and Drop
- \example quick/draganddrop
+ \example draganddrop
\brief This is a collection of QML drag and drop examples
\image qml-draganddrop-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/imageelements/doc/src/imageelements.qdoc b/examples/quick/imageelements/doc/src/imageelements.qdoc
index cae5d20134..5abcece4fc 100644
--- a/examples/quick/imageelements/doc/src/imageelements.qdoc
+++ b/examples/quick/imageelements/doc/src/imageelements.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QML Examples - Image Elements
- \example quick/imageelements
+ \example imageelements
\brief This is a collection of QML examples relating to image types.
\image qml-imageelements-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/keyinteraction/doc/src/keyinteraction.qdoc b/examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
index 3f84572084..d29536c66c 100644
--- a/examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
+++ b/examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - Key Interaction
- \example quick/keyinteraction
+ \example keyinteraction
\brief This is a collection of QML keyboard interaction examples.
\image qml-keyinteraction-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/localstorage/doc/src/localstorage.qdoc b/examples/quick/localstorage/doc/src/localstorage.qdoc
index 92d2101558..0a5d1cd6fd 100644
--- a/examples/quick/localstorage/doc/src/localstorage.qdoc
+++ b/examples/quick/localstorage/doc/src/localstorage.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - Local Storage
- \example quick/localstorage
+ \example localstorage
\brief A collection of QML local storage examples.
\image qml-localstorage-example.png
diff --git a/examples/quick/mousearea/doc/src/mousearea.qdoc b/examples/quick/mousearea/doc/src/mousearea.qdoc
index a7368b9273..b0d9abce8f 100644
--- a/examples/quick/mousearea/doc/src/mousearea.qdoc
+++ b/examples/quick/mousearea/doc/src/mousearea.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - MouseArea
- \example quick/mousearea
+ \example mousearea
\brief This is an example of the MouseArea type in QML
\image qml-mousearea-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
index fff7f2147d..d4aabc01d8 100644
--- a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
+++ b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
@@ -29,7 +29,7 @@
/*!
\title Scenegraph Painted Item Example
\brief Shows how to implement QPainter-based custom scenegraph items.
- \example quick/customitems/painteditem
+ \example customitems/painteditem
\ingroup qtquickexamples
The Painted Item example shows how to use the QML Scene Graph framework to
diff --git a/examples/quick/particles/affectors/doc/src/affectors.qdoc b/examples/quick/particles/affectors/doc/src/affectors.qdoc
index 3d0a84e1d4..58661d5b70 100644
--- a/examples/quick/particles/affectors/doc/src/affectors.qdoc
+++ b/examples/quick/particles/affectors/doc/src/affectors.qdoc
@@ -27,7 +27,7 @@
/*!
\title Qt Quick Particles Examples - Affectors
- \example quick/particles/affectors
+ \example particles/affectors
\brief This is a collection of examples using Affectors in the QML particle system.
\image qml-affectors-example.png
diff --git a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
index bb68c5fe9e..ccef82c922 100644
--- a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
+++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
@@ -27,7 +27,7 @@
/*!
\title Qt Quick Particles Examples - CustomParticle
- \example quick/particles/customparticle
+ \example particles/customparticle
\brief This is a collection of examples using CustomParticle in the QML particle system.
\image qml-customparticle-example.png
diff --git a/examples/quick/particles/emitters/doc/src/emitters.qdoc b/examples/quick/particles/emitters/doc/src/emitters.qdoc
index 63cb305c16..8eb7919000 100644
--- a/examples/quick/particles/emitters/doc/src/emitters.qdoc
+++ b/examples/quick/particles/emitters/doc/src/emitters.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Particles Examples - Emitters
- \example quick/particles/emitters
+ \example particles/emitters
\brief This is a collection of examples using Emitters in the QML particle system.
\image qml-emitters-example.png
diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
index 85c1a62a9a..c8f2dc988b 100644
--- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
+++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
@@ -27,7 +27,7 @@
/*!
\title Qt Quick Particles Examples - Affectors
- \example quick/particles/imageparticle
+ \example particles/imageparticle
\brief This is a collection of examples using Affectors in the QML particle system.
\image qml-imageparticle-example.png
diff --git a/examples/quick/particles/system/doc/src/system.qdoc b/examples/quick/particles/system/doc/src/system.qdoc
index bb32325da3..04dc1727d2 100644
--- a/examples/quick/particles/system/doc/src/system.qdoc
+++ b/examples/quick/particles/system/doc/src/system.qdoc
@@ -27,7 +27,7 @@
/*!
\title Qt Quick Particles Examples - Affectors
- \example quick/particles/system
+ \example particles/system
\brief This is a collection of examples using Affectors in the QML particle system.
\image qml-system-example.png
@@ -40,7 +40,7 @@
Start and Stop simply sets the running and paused states of a ParticleSystem. While the system does not perform any simulation when stopped or paused, a restart restarts the simulation from the beginning, while unpausing resumes the simulation from where it was.
- Timed group changes is an example that highlights the ParticleGroup type. While normally referring to groups with a string name is sufficent, additional effects can be
+ Timed group changes is an example that highlights the ParticleGroup type. While normally referring to groups with a string name is sufficient, additional effects can be
done by setting properties on groups.
The first group has a variable duration on it, but always transitions to the second group.
\snippet quick/particles/system/content/timedgroupchanges.qml 0
diff --git a/examples/quick/positioners/doc/src/positioners.qdoc b/examples/quick/positioners/doc/src/positioners.qdoc
index 015fe759e1..3a20b145ef 100644
--- a/examples/quick/positioners/doc/src/positioners.qdoc
+++ b/examples/quick/positioners/doc/src/positioners.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - Positioners
- \example quick/positioners
+ \example positioners
\brief This is a collection of QML Positioner examples.
\image qml-positioners-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/righttoleft/doc/src/righttoleft.qdoc b/examples/quick/righttoleft/doc/src/righttoleft.qdoc
index d7dc5792ea..6a207f7233 100644
--- a/examples/quick/righttoleft/doc/src/righttoleft.qdoc
+++ b/examples/quick/righttoleft/doc/src/righttoleft.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - Right to Left
- \example quick/righttoleft
+ \example righttoleft
\brief This is a collection of QML Right to Left examples.
\image qml-righttoleft-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
index dbc4d59470..d98407b6c1 100644
--- a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
+++ b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example quick/scenegraph/customgeometry
+ \example scenegraph/customgeometry
\title Scene Graph - Custom Geometry
\ingroup qtquickexamples
\brief Shows how to implement a custom geometry in the Qt Quick Scene Graph.
diff --git a/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc b/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
index 49f1a825e1..4bf5444d79 100644
--- a/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
+++ b/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example quick/scenegraph/openglunderqml
+ \example scenegraph/openglunderqml
\title Scene Graph - OpenGL Under QML
\ingroup qtquickexamples
\brief Shows how to render OpenGL under a Qt Quick scene.
diff --git a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
index 97cc4677d5..1529649798 100644
--- a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
+++ b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example quick/scenegraph/simplematerial
+ \example scenegraph/simplematerial
\title Scene Graph - Simple Material
\ingroup qtquickexamples
\brief Shows how to define a scene graph material to fill a shape.
diff --git a/examples/quick/shadereffects/doc/src/shadereffects.qdoc b/examples/quick/shadereffects/doc/src/shadereffects.qdoc
index fdc80a05c0..5d1547a1fe 100644
--- a/examples/quick/shadereffects/doc/src/shadereffects.qdoc
+++ b/examples/quick/shadereffects/doc/src/shadereffects.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QML Examples - Shader Effects
- \example quick/shadereffects
+ \example shadereffects
\image qml-shadereffects-example.png
\brief This is a shader effects example
\ingroup qtquickexamples
diff --git a/examples/quick/text/doc/src/text.qdoc b/examples/quick/text/doc/src/text.qdoc
index 82d142988b..1f173ac843 100644
--- a/examples/quick/text/doc/src/text.qdoc
+++ b/examples/quick/text/doc/src/text.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QML Examples - Text
- \example quick/text
+ \example text
\brief This is a collection of QML examples relating to text
\image qml-text-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/threading/doc/src/threading.qdoc b/examples/quick/threading/doc/src/threading.qdoc
index b27b027216..71fcdf820b 100644
--- a/examples/quick/threading/doc/src/threading.qdoc
+++ b/examples/quick/threading/doc/src/threading.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - Threading
- \example quick/threading
+ \example threading
\brief This is a collection of QML Multithreading examples.
\image qml-threading-example.png
\ingroup qtquickexamples
diff --git a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
index 2d383aff58..164409076c 100644
--- a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
+++ b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title Qt Quick Examples - Touch Interaction
- \example quick/touchinteraction
+ \example touchinteraction
\brief This is a collection of QML Touch Interaction examples.
\image qml-touchinteraction-example.png
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
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf
index 2f92f45245..4ce44ba46e 100644
--- a/src/qml/doc/qtqml.qdocconf
+++ b/src/qml/doc/qtqml.qdocconf
@@ -5,6 +5,8 @@ description = Qt QML Reference Documentation
url = http://qt-project.org/doc/qt-$QT_VER/qtqml
version = $QT_VERSION
+examplesinstallpath = qml
+
qhp.projects = QtQml
qhp.QtQml.file = qtqml.qhp
diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
index 82c04b1457..3253752e47 100644
--- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
+++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
@@ -64,7 +64,7 @@ and \l {qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}.
/*!
\title Chapter 1: Creating a New Type
-\example quick/tutorials/extending/chapter1-basics
+\example tutorials/extending/chapter1-basics
A common task when extending QML is to provide a new QML type that supports some
custom functionality beyond what is provided by the built-in \l {Qt Quick QML Types}{Qt Quick types}.
@@ -162,7 +162,7 @@ Try it yourself with the code in Qt's \c examples/quick/tutorials/extending/chap
/*!
\title Chapter 2: Connecting to C++ Methods and Signals
-\example quick/tutorials/extending/chapter2-methods
+\example tutorials/extending/chapter2-methods
Suppose we want \c PieChart to have a "clearChart()" method that erases the
chart and then emits a "chartCleared" signal. Our \c app.qml would be able
@@ -207,7 +207,7 @@ Try out the example yourself with the updated code in Qt's \c examples/quick/tut
/*!
\title Chapter 3: Adding Property Bindings
-\example quick/tutorials/extending/chapter3-bindings
+\example tutorials/extending/chapter3-bindings
Property binding is a powerful feature of QML that allows values of different
types to be synchronized automatically. It uses signals to notify and update
@@ -259,7 +259,7 @@ custom QML types may see unexpected behavior if bindings are not implemented.
/*!
\title Chapter 4: Using Custom Property Types
-\example quick/tutorials/extending/chapter4-customPropertyTypes
+\example tutorials/extending/chapter4-customPropertyTypes
The \c PieChart type currently has a string-type property and a color-type property.
It could have many other types of properties. For example, it could have an
@@ -343,7 +343,7 @@ Try it out with the code in Qt's \c examples/quick/tutorials/extending/chapter4-
/*!
\title Chapter 5: Using List Property Types
-\example quick/tutorials/extending/chapter5-listproperties
+\example tutorials/extending/chapter5-listproperties
Right now, a \c PieChart can only have one \c PieSlice. Ideally a chart would
have multiple slices, with different colors and sizes. To do this, we could
@@ -392,7 +392,7 @@ The complete code can be seen in the updated \c examples/quick/tutorials/extendi
/*!
\title Chapter 6: Writing an Extension Plugin
-\example quick/tutorials/extending/chapter6-plugins
+\example tutorials/extending/chapter6-plugins
Currently the \c PieChart and \c PieSlice types are used by \c app.qml,
which is displayed using a QQuickView in a C++ application. An alternative
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
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index e805a6b074..274b93e81a 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -1833,7 +1833,7 @@ void tst_QQuickPathView::snapToItem()
flick(window.data(), QPoint(200,10), QPoint(10,10), 180);
QVERIFY(pathview->isMoving());
- QTRY_VERIFY(!pathview->isMoving());
+ QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
QVERIFY(pathview->offset() == qFloor(pathview->offset()));