Merge remote-tracking branch 'origin/6.0'

Change-Id: I0eae76ecff1a315877e4fdd471f0de3a3a55f180

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

@@ -505,10 +505,10 @@
         \if defined(qtcreator)
         \row
             \li  Record a text-editing macro
-            \li  Alt+(
+            \li  Alt+[
         \row
             \li  Stop recording a macro
-            \li  Alt+)
+            \li  Alt+]
         \row
             \li  Play last macro
             \li  Alt+R

doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc

@@ -282,8 +282,8 @@
     \uicontrol{Application Output} pane. However, only one output pane tab may be
     open at a time or the output is not displayed correctly. You can use an
     external debug output viewer, such as the
-    \l{http://technet.microsoft.com/en-us/sysinternals/bb896647}{DebugView for Windows}
-    to display output from GUI applications.
+    \l{https://technet.microsoft.com/en-us/sysinternals/bb896647}
+    {DebugView for Windows} to display output from GUI applications.
 
     \section1 Questions about New Features