Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d

doc/src/howto/creator-external-tools.qdoc

@@ -73,8 +73,8 @@
     You can open files for editing in the default text editor for your system:
     Notepad on Windows and vi on Linux and Mac OS.
     To open the file you are currently viewing in an external editor, select
-    \gui {Tools > External > Text > Notepad} or \gui vi, depending on your
-    system.
+    \gui Tools > \gui External > \gui Text > \gui {Edit with Notepad} or
+    \gui {Edit with vi}, depending on your system.
 
     \QC looks for the editor path in the PATH environment variable
     of your operating system.

doc/src/howto/creator-keyboard-shortcuts.qdoc

@@ -194,6 +194,11 @@
         \row
             \o Toggle \gui{Compile Output} pane
             \o Alt+4 (Cmd+4 on Mac OS X)
+        \row
+            \o Toggle other output panes
+            \o Alt+number (Cmd+number on Mac OS X)
+
+            Where the number is the number of the output pane.
         \row
             \o Activate \gui Bookmarks pane
             \o Alt+M

doc/src/howto/creator-tips.qdoc

@@ -100,6 +100,10 @@
 
     \endlist
 
+    To open the other output panes, such as \gui{General Messages} and
+    \gui{Version Control}, select \gui Window > \gui {Output Panes}. The menu
+    items also display the keyboard shortcuts that you can use.
+
     For more information about output panes, see \l{Viewing Output}.
 
     \section1 Using Keyboard Shortcuts