summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-11 16:34:58 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-11 17:04:04 +0200
commit1088aabe6ad770041f038d9eee9da11b9227d36e (patch)
tree693bf3350f113419564aed75e482741eb7e7336a
parent99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f (diff)
parent2223f1ae293c2aedf4759564185f74b782395459 (diff)
Merge branch 'release' into old/5.0old/5.0
-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.qdoc5
-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.qdocconf4
-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--sync.profile6
-rw-r--r--tests/auto/quick/qquickpathview/tst_qquickpathview.cpp2
38 files changed, 108 insertions, 61 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 ac4e33183e..e279a327de 100644
--- a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc
+++ b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick Examples - XMLHttpRequst
- \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 9054b5e394..b14d9dd4dc 100644
--- a/examples/quick/accessibility/doc/src/accessibility.qdoc
+++ b/examples/quick/accessibility/doc/src/accessibility.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick 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 2b41fd71bc..3df0caf322 100644
--- a/examples/quick/animation/doc/src/animation.qdoc
+++ b/examples/quick/animation/doc/src/animation.qdoc
@@ -27,7 +27,7 @@
/*!
\title QtQuick 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 8da29e2780..5e88b62074 100644
--- a/examples/quick/canvas/doc/src/canvas.qdoc
+++ b/examples/quick/canvas/doc/src/canvas.qdoc
@@ -27,7 +27,7 @@
/*!
\title QtQuick 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 2920398de1..5debe9e02c 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 1844c3b4eb..4e97902354 100644
--- a/examples/quick/draganddrop/doc/src/draganddrop.qdoc
+++ b/examples/quick/draganddrop/doc/src/draganddrop.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick 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 abd5f332e5..d40b51898d 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 elements.
\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 ad9121c917..129efbf112 100644
--- a/examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
+++ b/examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick 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 f4dfa56dcf..38cb735576 100644
--- a/examples/quick/localstorage/doc/src/localstorage.qdoc
+++ b/examples/quick/localstorage/doc/src/localstorage.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick 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 10f92e689e..fc62f41536 100644
--- a/examples/quick/mousearea/doc/src/mousearea.qdoc
+++ b/examples/quick/mousearea/doc/src/mousearea.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick Examples - MouseArea
- \example quick/mousearea
+ \example mousearea
\brief This is an example of the MouseArea element 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 6f1d751a5f..7ea5a86149 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 977eb8ea95..75bdea8f14 100644
--- a/examples/quick/particles/affectors/doc/src/affectors.qdoc
+++ b/examples/quick/particles/affectors/doc/src/affectors.qdoc
@@ -27,7 +27,7 @@
/*!
\title QtQuick.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 341484d9ab..a7ab4c51b8 100644
--- a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
+++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
@@ -27,7 +27,7 @@
/*!
\title QtQuick.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 5644ab1af3..39e1fdd13c 100644
--- a/examples/quick/particles/emitters/doc/src/emitters.qdoc
+++ b/examples/quick/particles/emitters/doc/src/emitters.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick.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 1de194b962..2c355d78b5 100644
--- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
+++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
@@ -27,7 +27,7 @@
/*!
\title QtQuick.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 a01b014f4b..f65ff130cc 100644
--- a/examples/quick/particles/system/doc/src/system.qdoc
+++ b/examples/quick/particles/system/doc/src/system.qdoc
@@ -27,7 +27,7 @@
/*!
\title QtQuick.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 element. 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 element. 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
@@ -56,4 +56,3 @@
Multiple Painters shows how to control paint ordering of individual particles. While the paint ordering of particles within one ImagePainter is not strictly defined, ImageParticle elements follow the normal Z-ordering rules for QtQuick items. This example allow you to paint the inside of the particles above the black borders using a pair of ImageParticles each painting different parts of the same logical particle.
*/
-
diff --git a/examples/quick/positioners/doc/src/positioners.qdoc b/examples/quick/positioners/doc/src/positioners.qdoc
index 8dd7de193c..55e1a4bf09 100644
--- a/examples/quick/positioners/doc/src/positioners.qdoc
+++ b/examples/quick/positioners/doc/src/positioners.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick 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 af851339c6..4a115c1267 100644
--- a/examples/quick/righttoleft/doc/src/righttoleft.qdoc
+++ b/examples/quick/righttoleft/doc/src/righttoleft.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick 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 cc034e34ba..9e75298965 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 Custom Geometry Example
\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 5ded717e5f..475f03cff0 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 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 20d244fe99..730bbc7524 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 Simple Material Example
\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 b8b5459c29..fd819f2ec1 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 fd5d32f5cd..652065282e 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 b87cb1b952..47f23a6019 100644
--- a/examples/quick/threading/doc/src/threading.qdoc
+++ b/examples/quick/threading/doc/src/threading.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick 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 54f94383e4..805ca3563e 100644
--- a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
+++ b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\title QtQuick 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 e48a66514b..06482ae738 100644
--- a/examples/quick/views/doc/src/views.qdoc
+++ b/examples/quick/views/doc/src/views.qdoc
@@ -27,7 +27,7 @@
/*!
\title QtQuick 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 61d7e706ec..d29f1454b9 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
@@ -34,7 +36,7 @@ headerdirs += ..
sourcedirs += ..
-exampledirs += ../../../examples/ \
+exampledirs += ../../../examples/qml \
../ \
snippets
diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
index 63c06e2706..3cba89eb67 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}{QtQuick 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
elements 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 7fba78da10..81edfe146e 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 5e7affc5ed..e29aa3b518 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 @@ elements 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 26f418516a..65c8a1a187 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 elements 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/sync.profile b/sync.profile
index bddfd0f7f3..180ef01430 100644
--- a/sync.profile
+++ b/sync.profile
@@ -17,7 +17,7 @@
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
#
%dependencies = (
- "qtbase" => "refs/heads/stable",
- "qtxmlpatterns" => "refs/heads/stable",
- "qtjsbackend" => "refs/heads/stable",
+ "qtbase" => "refs/heads/old/5.0",
+ "qtxmlpatterns" => "refs/heads/old/5.0",
+ "qtjsbackend" => "refs/heads/old/5.0",
);
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 8821203902..77c4f806ae 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -1860,7 +1860,7 @@ void tst_QQuickPathView::snapToItem()
flick(window, 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()));