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

3 files changed, 6 insertions, 6 deletions

diff --git a/examples/qml/networkaccessmanagerfactory/view.qml b/examples/qml/networkaccessmanagerfactory/view.qml
index a1294d778..79934cfd1 100644
--- a/examples/qml/networkaccessmanagerfactory/view.qml
+++ b/examples/qml/networkaccessmanagerfactory/view.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.0
 
 Image {
-    width: 100
+    width: 200
     height: 100
-    source: "http://qt.io/Documents/Qt_master_logo_CMYK_noback.gif"
+    source: "http://doc.qt.io/qt-5/images/logo.png"
 }
diff --git a/examples/quick/demos/maroon/doc/src/maroon.qdoc b/examples/quick/demos/maroon/doc/src/maroon.qdoc
index fcbe2923c..3e38f8cfc 100644
--- a/examples/quick/demos/maroon/doc/src/maroon.qdoc
+++ b/examples/quick/demos/maroon/doc/src/maroon.qdoc
@@ -257,7 +257,7 @@
     appear at the bottom of the new game screen and game canvas and slowly float
     towards the top on varying trajectories.
 
-    To use the ParticleSystem type, we must import \l{Qt Quick Particles}:
+    To use the ParticleSystem type, we must import \l{Qt Quick Particles QML Types}:
 
     \quotefromfile demos/maroon/maroon.qml
     \skipto Particles
diff --git a/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc b/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc
index 4da23f9b6..9c0f8b337 100644
--- a/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc
+++ b/examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc
@@ -306,10 +306,10 @@
     \printuntil }
     \printuntil }
 
-    We use the \l qsTr() command to mark the button labels translatable.
+    We use the \l[QML]{Qt::}{qsTr()} command to mark the button labels translatable.
 
-    We use the \l lupdate tool to generate the translation source files and
-    the \l lrelease tool to convert the translated strings to the QM files used
+    We use the \c lupdate() tool to generate the translation source files and
+    the \c lrelease() tool to convert the translated strings to the QM files used
     by the application at runtime. These files are stored in the \c i18n
     directory.