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, 16 insertions, 16 deletions

diff --git a/examples/quick/views/doc/src/views.qdoc b/examples/quick/views/doc/src/views.qdoc
index cc8112f4dd..2d664c9bd9 100644
--- a/examples/quick/views/doc/src/views.qdoc
+++ b/examples/quick/views/doc/src/views.qdoc
@@ -32,51 +32,51 @@
     \image qml-modelviews-example.png
     \ingroup qtquickexamples
 
-    This is a collection of small QML examples relating to model and view functionality. They demonstrate how to show data from a model using the QtQuick view types.
+    This is a collection of small QML examples relating to model and view functionality. They demonstrate how to show data from a model using the \l {Qt Quick} view types.
 
     \section2 GridView and PathView demonstrate usage of these types to display views.
-    \snippet quick/views/gridview/gridview-example.qml 0
+    \snippet views/gridview/gridview-example.qml 0
 
     \section2 Dynamic List demonstrates animation of runtime additions and removals to a ListView.
 
     The ListView.onAdd signal handler runs an animation when new items are added to the
     view, and the ListView.onRemove another when they are removed.
-    \snippet quick/views/listview/dynamiclist.qml 0
-    \snippet quick/views/listview/dynamiclist.qml 1
+    \snippet views/listview/dynamiclist.qml 0
+    \snippet views/listview/dynamiclist.qml 1
 
     \section2 Expanding Delegates demonstrates delegates that expand when activated.
 
     It has a complex delegate the size and appearance of which can change, displacing
     other items in the view.
-    \snippet quick/views/listview/expandingdelegates.qml 0
-    \snippet quick/views/listview/expandingdelegates.qml 1
-    \snippet quick/views/listview/expandingdelegates.qml 2
-    \snippet quick/views/listview/expandingdelegates.qml 3
+    \snippet views/listview/expandingdelegates.qml 0
+    \snippet views/listview/expandingdelegates.qml 1
+    \snippet views/listview/expandingdelegates.qml 2
+    \snippet views/listview/expandingdelegates.qml 3
 
     \section2 Highlight demonstrates adding a custom highlight to a ListView.
-    \snippet quick/views/listview/highlight.qml 0
+    \snippet views/listview/highlight.qml 0
 
     \section2 Highlight Ranges shows the three different highlight range modes of ListView.
-    \snippet quick/views/listview/highlightranges.qml 0
-    \snippet quick/views/listview/highlightranges.qml 1
-    \snippet quick/views/listview/highlightranges.qml 2
+    \snippet views/listview/highlightranges.qml 0
+    \snippet views/listview/highlightranges.qml 1
+    \snippet views/listview/highlightranges.qml 2
 
     \section2 Sections demonstrates the various section headers and footers available to ListView.
-    \snippet quick/views/listview/sections.qml 0
+    \snippet views/listview/sections.qml 0
 
     \section2 Packages demonstrates using Packages to transition delegates between two views.
 
     It has a Package which defines delegate items for each view and an item that can
     be transferred between delegates.
 
-    \snippet quick/views/package/Delegate.qml 0
+    \snippet views/package/Delegate.qml 0
 
     A DelegateModel allows the individual views to access their specific items from
     the shared package delegate.
 
-    \snippet quick/views/package/view.qml 0
+    \snippet views/package/view.qml 0
 
     \section2 ObjectModel uses an ObjectModel for the model instead of a ListModel.
 
-    \snippet quick/views/visualitemmodel/visualitemmodel.qml 0
+    \snippet views/objectmodel/objectmodel.qml 0
 */