Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5

doc/src/howto/creator-ui.qdoc

@@ -326,6 +326,9 @@
 
     \image qtcreator-application-output.png
 
+    Select toolbar buttons to run applications, to attach the debugger to the
+    running application, and to stop running or debugging.
+
     \section2 Compile Output
 
     The \gui{Compile Output} pane provides all output from the compiler.
@@ -334,6 +337,11 @@
 
     \image qtcreator-compile-pane.png
 
+    Double-click on a file name in an error message to open the file in the
+    code editor.
+
+    Select the \gui {Cancel Build} button to cancel the build.
+
     \section2 To-Do List
 
     The \gui {To-Do List Entries} pane lists the BUG, FIXME, NOTE, TODO, and
@@ -383,6 +391,8 @@
 
         \o  Return to original size
 
+        \o  Play and pause movies
+
     \endlist
 
     \section1 Navigating with Keyboard