Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	.qmake.conf
	LICENSE.GPLv2
	examples/qml/networkaccessmanagerfactory/view.qml
	src/qml/jsruntime/qv4runtime.cpp
	src/qml/jsruntime/qv4stringobject.cpp

Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32

6 files changed, 21 insertions, 23 deletions

diff --git a/src/quick/doc/images/qml-item-canvas.arc.png b/src/quick/doc/images/qml-item-canvas-arc.png
index 5f9d32d8d3..5f9d32d8d3 100644
--- a/src/quick/doc/images/qml-item-canvas.arc.png
+++ b/src/quick/doc/images/qml-item-canvas-arc.png
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 41fe42777b..afe1b9708f 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -33,7 +33,7 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtquick/qtquick.tags
 
-depends += qtcore qtxmlpatterns qtqml qtgui qtlinguist qtquickcontrols qtquicklayouts qtdoc qtquickdialogs qtsensors qtwidgets
+depends += qtcore qtxmlpatterns qtqml qtgui qtlinguist qtquickcontrols qtquicklayouts qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects
 
 headerdirs  += ..\
                ../../quickwidgets
diff --git a/src/quick/doc/src/concepts/effects/sprites.qdoc b/src/quick/doc/src/concepts/effects/sprites.qdoc
index 2af463e4bf..edad89b1e5 100644
--- a/src/quick/doc/src/concepts/effects/sprites.qdoc
+++ b/src/quick/doc/src/concepts/effects/sprites.qdoc
@@ -144,14 +144,12 @@ to some graphics memory limitations. Because it requires all the sprites for a s
 texture, attempting to load many different animations can run into texture memory limits on embedded devices. In
 these situations, a warning will be output to the console containing the maximum texture size.
 
-There are several software tools to help turn images into sprite sheets, here are some examples:
-Photoshop plugin:
-http://www.personal.psu.edu/zez1/blogs/my_blog/2011/05/scripts-4-photoshop-file-sequence-to-layers-to-sprite-sheet.html
-Gimp plugin:
-http://registry.gimp.org/node/20943
-Cmd-line tool:
-http://www.imagemagick.org/script/montage.php
-
+There are several tools to help turn a set of images into sprite sheets, here are some examples:
+\list
+ \li Photoshop plugin: \l http://www.johnwordsworth.com/projects/photoshop-sprite-sheet-generator-script
+ \li Gimp plugin: \l http://registry.gimp.org/node/20943
+ \li Cmd-line tool: \l http://www.imagemagick.org/script/montage.php
+\endlist
 
 \section2 QML Types Using the Sprite Engine
 
diff --git a/src/quick/doc/src/concepts/input/focus.qdoc b/src/quick/doc/src/concepts/input/focus.qdoc
index 90999d8b5e..db84961d20 100644
--- a/src/quick/doc/src/concepts/input/focus.qdoc
+++ b/src/quick/doc/src/concepts/input/focus.qdoc
@@ -138,7 +138,7 @@ similar to when there are no focus scopes.
 \li When a focus scope receives active focus, the contained type with
 \c focus set (if any) also gets the active focus. If this type is
 also a \l FocusScope, the proxying behavior continues. Both the
-focus scope and the sub-focused item will have \c activeFocus property set.
+focus scope and the sub-focused item will have the \c activeFocus property set.
 \endlist
 
 Note that, since the FocusScope type is not a visual type, the properties
diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index 7e6a5166a3..f87f94f264 100644
--- a/src/quick/doc/src/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -165,14 +165,14 @@ to the index of the item it was dragged over.
 To move the items within the view we use a DelegateModel.  The DelegateModel type is used by
 the view types to instantiate delegate items from model data and when constructed explicitly can
 be used to filter and re-order the model items provided to ListView.  The
-\l {QtQuick::DelegateModel::items}{items} property of DelegateModel provides access to the
+\l [QML]{DelegateModel::}{items} property of DelegateModel provides access to the
 view's items and allows us to change the visible order without modifying the source model.  To
-determine the current visible index of the items we use \l {QtQuick::DelegateModel::itemsIndex}
+determine the current visible index of the items we use \l {DelegateModel::}{itemsIndex}
 {itemsIndex} property on the DelegateModel attached property of the delegate item.
 
-To utilize a DelegateModel with a ListView we bind it to the \l {QtQuick::ListView::model}{model}
-property of the view and bind the \l {QtQuick::DelegateModel::model}{model} and
-\l {QtQuick::DelegateModel::delegate}{delegate} to the DelegateModel.
+To utilize a DelegateModel with a ListView we bind it to the \l {ListView::}{model}
+property of the view and bind the \l {DelegateModel::}{model} and
+\l {DelegateModel::}{delegate} to the DelegateModel.
 
 \snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 4
 
@@ -194,7 +194,7 @@ like this:
 \section2 Walkthrough
 
 Items in a DelegateModel are filtered into groups represented by the DelegateModelGroup type,
-normally all items in the model belong to a default \l {QtQuick::DelegateModel::items}{items}
+normally all items in the model belong to a default \l {DelegateModel::}{items}
 group but this default can be changed with the includeByDefault property.  To implement our sorting
 we want items to first be added to an unsorted group from where we can transfer them to a sorted
 position in the items group.  To do that we clear includeByDefault on the items group and set it on
@@ -208,7 +208,7 @@ item and then transfer the item to the items group before moving it to the pre-d
 repeat until the unsorted group is empty.
 
 To find the insert position for an item we request a handle for the item from the unsorted group
-with the \l {QtQuick::DelegateModel::get} {get} function.  Through the model property on this
+with the \l {DelegateModel::}{get} function.  Through the model property on this
 handle we can access the same model data that is available in a delegate instance of that item and
 compare against other items to determine relative position.
 
@@ -220,7 +220,7 @@ of the list.  In this example it can be one of the following:
 \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 4
 
 A sort is triggered whenever new items are added to the unsorted DelegateModel which we are
-notified of by the \l {QtQuick::DelegateModelGroup::onChanged}{onChanged} handler.  If no sort
+notified of by the \l {DelegateModelGroup} \c onChanged handler.  If no sort
 function is currently selected we simply transfer all items from the unsorted group to the items
 group, otherwise we call sort with the selected sort function.
 
@@ -228,8 +228,8 @@ group, otherwise we call sort with the selected sort function.
 
 Finally when the selected sort order changes we can trigger a full re-sort of the list by moving
 all items from the items group to the unsorted group, which will trigger the
-\l {QtQuick::DelegateModelGroup::onChanged}{onChanged} handler and transfer the items back to the
-items group in correct order.  Note that the \l {QtQuick::DelegateModelGroup::onChanged}{onChanged}
+\l {DelegateModelGroup} \c onChanged handler and transfer the items back to the
+items group in correct order.  Note that the \l {DelegateModelGroup} \c onChanged
 handler will not be invoked recursively so there's no issue with it being invoked during a sort.
 
 \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 6
diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc
index 21ab4a2731..b0a39e1dd3 100644
--- a/src/quick/doc/src/whatsnew.qdoc
+++ b/src/quick/doc/src/whatsnew.qdoc
@@ -193,7 +193,7 @@ relative to its start.
 \endlist
 
 
-\section2 Text
+\section2 Text Rendering and Input
 
 \list
 \li Changes common to \l Text, TextEdit and TextInput:
@@ -312,8 +312,8 @@ the window loses focus.
 \li VisualDataModel:
     \list
     \li Now has features to filter the items to be displayed in a view. This is supported by the new
-        \l {VisualDataModel::}{groups}, \l {VisualDataModel::}{filterOnGroup}, \l {VisualDataModel::}{items}
-        and \l {VisualDataModel::}{persistedItems} properties.
+        \l {DelegateModel::}{groups}, \l {DelegateModel::}{filterOnGroup}, \l {DelegateModel::}{items}
+        and \l {DelegateModel::}{persistedItems} properties.
     \endlist
 \li Changes common to both ListView and GridView:
     \list