Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4

Conflicts:
	src/imports/qtquick2/plugins.qmltypes
	src/qml/debugger/qv8debugservice.cpp
	src/qml/qml/qml.pri
	src/qml/qml/qqmlcompiler.cpp
	src/qml/qml/qqmlcomponent.cpp
	src/qml/qml/qqmlcontext.cpp
	src/qml/qml/qqmldata_p.h
	src/qml/qml/qqmlengine_p.h
	src/qml/qml/qqmljavascriptexpression.cpp
	src/qml/qml/qqmlxmlhttprequest.cpp
	src/qml/qml/v4/qv4bindings.cpp
	src/qml/qml/v4/qv4irbuilder.cpp
	src/qml/qml/v4/qv4jsonobject_p.h
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	src/qml/qml/v8/qv8bindings.cpp
	src/qml/qml/v8/qv8contextwrapper.cpp
	src/qml/qml/v8/qv8listwrapper.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/qml/qml/v8/qv8qobjectwrapper_p.h
	src/qml/qml/v8/qv8sequencewrapper_p_p.h
	src/qml/qml/v8/qv8typewrapper.cpp
	src/qml/qml/v8/qv8valuetypewrapper.cpp
	src/qml/types/qqmldelegatemodel.cpp
	src/quick/items/context2d/qquickcanvasitem.cpp
	src/quick/items/context2d/qquickcontext2d.cpp
	sync.profile
	tests/auto/qml/qjsengine/tst_qjsengine.cpp
	tests/benchmarks/qml/animation/animation.pro
	tools/qmlprofiler/qmlprofiler.pro

Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9

1 files changed, 9 insertions, 9 deletions

diff --git a/examples/quick/text/doc/src/text.qdoc b/examples/quick/text/doc/src/text.qdoc
index 1f173ac843..c93d2db8aa 100644
--- a/examples/quick/text/doc/src/text.qdoc
+++ b/examples/quick/text/doc/src/text.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 /*!
-    \title QML Examples - Text
+    \title Qt Quick Examples - Text
     \example text
     \brief This is a collection of QML examples relating to text
     \image qml-text-example.png
@@ -38,24 +38,24 @@
     'Hello' shows how to change and animate the letter spacing of a Text type.
     It uses a sequential animation to first animate the font.letterSpacing property
     from 0 to 50 over 3 seconds and then move the text to a random position on screen:
-    \snippet quick/text/fonts/hello.qml letterspacing
+    \snippet text/fonts/hello.qml letterspacing
 
     'Fonts' shows different ways of using fonts with the Text type.
     Simply by name, using the font.family property directly:
-    \snippet quick/text/fonts/fonts.qml name
+    \snippet text/fonts/fonts.qml name
     or using a FontLoader type:
-    \snippet quick/text/fonts/fonts.qml fontloader
+    \snippet text/fonts/fonts.qml fontloader
     or using a FontLoader and specifying a local font file:
-    \snippet quick/text/fonts/fonts.qml fontloaderlocal
+    \snippet text/fonts/fonts.qml fontloaderlocal
     or finally using a FontLoader and specifying a remote font file:
-    \snippet quick/text/fonts/fonts.qml fontloaderremote
+    \snippet text/fonts/fonts.qml fontloaderremote
 
     'Available Fonts' shows how to use the QML global Qt object and a list view
     to display all the fonts available on the system.
     The ListView type uses the list of fonts available as its model:
-    \snippet quick/text/fonts/availableFonts.qml model
+    \snippet text/fonts/availableFonts.qml model
     Inside the delegate, the font family is set with the modelData:
-    \snippet quick/text/fonts/availableFonts.qml delegate
+    \snippet text/fonts/availableFonts.qml delegate
 
     'Banner' is a simple example showing how to create a banner using a row of text
     types and a NumberAnimation.
@@ -66,5 +66,5 @@
     'Text Layout' shows how to create a more complex layout for a text item.
     This example lays out the text in two columns using the onLineLaidOut handler
     that allows you to position and resize each line:
-    \snippet quick/text/styledtext-layout.qml layout
+    \snippet text/styledtext-layout.qml layout
 */