From: Frederik Gladhorn Date: Wed, 3 Apr 2013 14:16:08 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/release' into stable X-Git-Tag: upstream/5.2.1~808^2~8^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acc94a42cd9c31ac68e063edc1caada4251d12b0;p=platform%2Fupstream%2Fqtdeclarative.git 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 --- acc94a42cd9c31ac68e063edc1caada4251d12b0 diff --cc examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc index 5167ecf,e279a32..db0b9e0 --- a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc +++ b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - XMLHttpRequst + \title Qt Quick Examples - XMLHttpRequest - \example qml/xmlhttprequest + \example xmlhttprequest \brief This is a collection of XMLHttpRequest examples \image qml-xmlhttprequest-example.png diff --cc examples/quick/accessibility/doc/src/accessibility.qdoc index 467ae3c,b14d9dd..a637383 --- a/examples/quick/accessibility/doc/src/accessibility.qdoc +++ b/examples/quick/accessibility/doc/src/accessibility.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - Accessibility + \title Qt Quick Examples - Accessibility - \example quick/accessibility + \example accessibility \brief This example has accessible buttons. \ingroup qtquickexamples diff --cc examples/quick/animation/doc/src/animation.qdoc index 21ed74a,3df0caf..0647178 --- a/examples/quick/animation/doc/src/animation.qdoc +++ b/examples/quick/animation/doc/src/animation.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \title QtQuick Examples - Animation + \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 --cc examples/quick/canvas/doc/src/canvas.qdoc index 5c694c5,5e88b62..638d25d --- a/examples/quick/canvas/doc/src/canvas.qdoc +++ b/examples/quick/canvas/doc/src/canvas.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \title QtQuick Examples - Canvas + \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 --cc examples/quick/draganddrop/doc/src/draganddrop.qdoc index 6762103,4e97902..381fdd1 --- a/examples/quick/draganddrop/doc/src/draganddrop.qdoc +++ b/examples/quick/draganddrop/doc/src/draganddrop.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - Drag and Drop + \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 --cc examples/quick/imageelements/doc/src/imageelements.qdoc index cae5d20,d40b518..5abcece --- a/examples/quick/imageelements/doc/src/imageelements.qdoc +++ b/examples/quick/imageelements/doc/src/imageelements.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! \title QML Examples - Image Elements - \example quick/imageelements + \example imageelements - \brief This is a collection of QML examples relating to image elements. + \brief This is a collection of QML examples relating to image types. \image qml-imageelements-example.png \ingroup qtquickexamples diff --cc examples/quick/keyinteraction/doc/src/keyinteraction.qdoc index 3f84572,129efbf..d29536c --- a/examples/quick/keyinteraction/doc/src/keyinteraction.qdoc +++ b/examples/quick/keyinteraction/doc/src/keyinteraction.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - Key Interaction + \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 --cc examples/quick/localstorage/doc/src/localstorage.qdoc index 92d2101,38cb735..0a5d1cd --- a/examples/quick/localstorage/doc/src/localstorage.qdoc +++ b/examples/quick/localstorage/doc/src/localstorage.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - Local Storage + \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 --cc examples/quick/mousearea/doc/src/mousearea.qdoc index a7368b9,fc62f41..b0d9abc --- a/examples/quick/mousearea/doc/src/mousearea.qdoc +++ b/examples/quick/mousearea/doc/src/mousearea.qdoc @@@ -25,9 -25,9 +25,9 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - MouseArea + \title Qt Quick Examples - MouseArea - \example quick/mousearea + \example mousearea - \brief This is an example of the MouseArea element in QML + \brief This is an example of the MouseArea type in QML \image qml-mousearea-example.png \ingroup qtquickexamples diff --cc examples/quick/particles/affectors/doc/src/affectors.qdoc index 3d0a84e,75bdea8..58661d5 --- a/examples/quick/particles/affectors/doc/src/affectors.qdoc +++ b/examples/quick/particles/affectors/doc/src/affectors.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \title QtQuick.Particles Examples - Affectors + \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 --cc examples/quick/particles/customparticle/doc/src/customparticle.qdoc index bb68c5f,a7ab4c5..ccef82c --- a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc +++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \title QtQuick.Particles Examples - CustomParticle + \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 --cc examples/quick/particles/emitters/doc/src/emitters.qdoc index 63cb305,39e1fdd..8eb7919 --- a/examples/quick/particles/emitters/doc/src/emitters.qdoc +++ b/examples/quick/particles/emitters/doc/src/emitters.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick.Particles Examples - Emitters + \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 --cc examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc index 85c1a62,2c355d7..c8f2dc9 --- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc +++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \title QtQuick.Particles Examples - Affectors + \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 --cc examples/quick/particles/system/doc/src/system.qdoc index bb32325,f65ff13..04dc172 --- a/examples/quick/particles/system/doc/src/system.qdoc +++ b/examples/quick/particles/system/doc/src/system.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \title QtQuick.Particles Examples - Affectors + \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 +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 element. While normally referring to groups with a string name is sufficient, 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 --cc examples/quick/positioners/doc/src/positioners.qdoc index 015fe75,55e1a4b..3a20b14 --- a/examples/quick/positioners/doc/src/positioners.qdoc +++ b/examples/quick/positioners/doc/src/positioners.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - Positioners + \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 --cc examples/quick/righttoleft/doc/src/righttoleft.qdoc index d7dc579,4a115c1..6a207f7 --- a/examples/quick/righttoleft/doc/src/righttoleft.qdoc +++ b/examples/quick/righttoleft/doc/src/righttoleft.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - Right to Left + \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 --cc examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc index dbc4d59,9e75298..d98407b --- a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc +++ b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \example quick/scenegraph/customgeometry + \example scenegraph/customgeometry - \title Custom Geometry Example + \title Scene Graph - Custom Geometry \ingroup qtquickexamples \brief Shows how to implement a custom geometry in the Qt Quick Scene Graph. diff --cc examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc index 49f1a82,475f03c..4bf5444 --- a/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc +++ b/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \example quick/scenegraph/openglunderqml + \example scenegraph/openglunderqml - \title OpenGL Under QML + \title Scene Graph - OpenGL Under QML \ingroup qtquickexamples \brief Shows how to render OpenGL under a Qt Quick scene. diff --cc examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc index 97cc467,730bbc7..1529649 --- a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc +++ b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \example quick/scenegraph/simplematerial + \example scenegraph/simplematerial - \title Simple Material Example + \title Scene Graph - Simple Material \ingroup qtquickexamples \brief Shows how to define a scene graph material to fill a shape. diff --cc examples/quick/threading/doc/src/threading.qdoc index b27b027,47f23a6..71fcdf8 --- a/examples/quick/threading/doc/src/threading.qdoc +++ b/examples/quick/threading/doc/src/threading.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - Threading + \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 --cc examples/quick/touchinteraction/doc/src/touchinteraction.qdoc index 2d383af,805ca35..1644090 --- a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc +++ b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc @@@ -25,8 -25,8 +25,8 @@@ ** ****************************************************************************/ /*! - \title QtQuick Examples - Touch Interaction + \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 --cc examples/quick/views/doc/src/views.qdoc index b807cea,06482ae..cc8112f --- a/examples/quick/views/doc/src/views.qdoc +++ b/examples/quick/views/doc/src/views.qdoc @@@ -26,8 -26,8 +26,8 @@@ ****************************************************************************/ /*! - \title QtQuick Examples - Views + \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 --cc src/qml/doc/src/cppintegration/extending-tutorial.qdoc index 82c04b1,3cba89e..3253752 --- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc +++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc @@@ -64,15 -64,15 +64,15 @@@ and \l {qtqml-cppintegration-definetype /*! \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}. + custom functionality beyond what is provided by the built-in \l {Qt Quick QML Types}{Qt Quick types}. For example, this could be done to implement particular data models, or provide -elements with custom painting and drawing capabilities, or access system features +types with custom painting and drawing capabilities, or access system features like network programming that are not accessible through built-in QML features. -In this tutorial, we will show how to use the C++ classes in the Qt Declarative +In this tutorial, we will show how to use the C++ classes in the Qt Quick module to extend QML. The end result will be a simple Pie Chart display implemented by several custom QML types connected together through QML features like bindings and signals, and made available to the QML runtime through a plugin. @@@ -207,11 -207,11 +207,11 @@@ Try out the example yourself with the u /*! \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 -other elements' values when property values are changed. +types to be synchronized automatically. It uses signals to notify and update +other types' values when property values are changed. Let's enable property bindings for the \c color property. That means if we have code like this: diff --cc src/quick/doc/src/dynamicview-tutorial.qdoc index 9c224f8,65c8a1a..daa14a6 --- a/src/quick/doc/src/dynamicview-tutorial.qdoc +++ b/src/quick/doc/src/dynamicview-tutorial.qdoc @@@ -139,10 -139,10 +139,10 @@@ so that is above other items in the sta \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; +can re-order the list. To achieve this we introduce three new types to our application; VisualDataModel, \l Drag and DropArea. \snippet quick/tutorials/dynamicview/dynamicview3/dynamicview.qml 0 diff --cc tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index e805a6b,77c4f80..274b93e --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@@ -1830,10 -1857,10 +1830,10 @@@ void tst_QQuickPathView::snapToItem( QSignalSpy snapModeSpy(pathview, SIGNAL(snapModeChanged())); - flick(window, QPoint(200,10), QPoint(10,10), 180); + 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()));