Merge remote-tracking branch 'origin/4.9' into 4.10

Change-Id: I5775afb845c26afa6fae9bdfc47dc9c3f9d5b975

doc/api/qtcreator-documentation.qdoc

@@ -165,18 +165,14 @@
     the \QC Manual, observe the guidelines listed in this section when taking
     screen shots.
 
-    To make the images look similar regardless of the operating system they were
+    \note Do not rely on screen shots present reasonable example values to
-    taken on, you are asked to adjust their size to 75%. This makes the screen
+    users, but always place example values also in the text.
-    shots hard to read, but they are provided more as reassurance for users that
-    they are in the correct place in the UI than as an actual source of
-    information. To make sure that no important information is lost, always
-    place example values also in the text.
 
     \list
-        \li Use the screen resolution of 1024x768 (this is available on all
+        \li Use the screen resolution of 1366x768 (available on the most
-            screens).
+            commonly used screens, as of this writing).
 
-        \li Use the aspect ratio of 4:3.
+        \li Use the aspect ratio of 16:9.
 
         \li Open the application in the maximum size on full screen.
 
@@ -185,9 +181,6 @@
         \li Include only the part of the screen that you need (you can crop the
             image also in the screen capture tool).
 
-        \li In the screen capture tool, open the screen shot and adjust its size
-            to 75%.
-
         \li To highlight parts of the screen shot, use the images of numbers
             that are stored in \c{doc\images\numbers} in the \QC repository.
 
@@ -212,13 +205,8 @@
     \c doc\images\numbers directory (or in the \c qtdoc module sources in
     \c doc\images\numbers).
 
-    To use the numbers:
+    To use the numbers, copy-paste the number images on the screenshot to the
-
+    places that you want to refer to from text.
-    \list
-        \li Take a screenshot as described above.
-        \li After resizing the screenshot, copy-paste the number images on
-            the screenshot to the places that you want to refer to from text.
-    \endlist
 
     \section2 Optimizing Images
 
@@ -234,8 +222,8 @@
 
     You can use a web service, such as \l{https://tinypng.com}, or an image
     optimization tool to shrink the images. For example, you can use the Radical
-    Image Optimization Tool (RIOT) on Windows (very efficient) or ImageOptim on
+    Image Optimization Tool (RIOT) or OptiPNG on Windows, ImageOptim on
-    \macos (much less efficient), or some other tool available on Linux.
+    \macos, or some other tool available on Linux.
 
     With ImageOptim, you simply drag and drop the image files to the
     application. The following section describes the settings to use for RIOT.

src/libs/ssh/sshconnection.cpp

@@ -348,8 +348,10 @@ void SshConnection::doConnectToHost()
                   .arg(sshBinary.toUserOutput()));
         return;
     }
-    if (!d->sharingEnabled)
+    if (!d->sharingEnabled) {
         emitConnected();
+        return;
+    }
     d->masterSocketDir.reset(new QTemporaryDir);
     if (!d->masterSocketDir->isValid()) {
         emitError(tr("Cannot establish SSH connection: Failed to create temporary "

src/shared/proparser/registry.cpp

@@ -29,6 +29,8 @@
 #include <QtCore/qstringlist.h>
 #include "registry_p.h"
 
+QT_BEGIN_NAMESPACE
+
 namespace QMakeInternal {
 
 #ifdef Q_OS_WIN32
@@ -156,3 +158,4 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey, unsigned l
 
 }  // namespace QMakeInternal
 
+QT_END_NAMESPACE