Merge remote-tracking branch 'origin/4.5'

 Conflicts:
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I726babe61e28db14d06a6a1a5c570e148745b458

2 files changed, 11 insertions, 0 deletions

diff --git a/doc/images/qtcreator-application-output.png b/doc/images/qtcreator-application-output.png
index f0b1886418..1064dd3a6d 100644
--- a/doc/images/qtcreator-application-output.png
+++ b/doc/images/qtcreator-application-output.png
diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc
index d76a24c140..875946bb50 100644
--- a/doc/src/projects/creator-projects-running.qdoc
+++ b/doc/src/projects/creator-projects-running.qdoc
@@ -61,6 +61,17 @@
 
     \endlist
 
+    The \uicontrol {Application Output} pane displays the status of the
+    application while it is running. You can select the \uicontrol Run button
+    in the pane to re-run applications without building them first. This is
+    useful when developing Qt Quick applications, because the QML files are
+    interpreted at runtime. Therefore, the application does not need to be
+    built again if you edited only QML files. This saves time especially if
+    the application contains large image files that would need to be bundled
+    into the resource file before running the application.
+
+    \image qtcreator-application-output.png
+
     For more information on the options you have, see
     \l{Specifying Run Settings}.