Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	mkspecs/features/qt.prf
	src/plugins/platforms/xcb/qxcbwindow.h
	src/tools/qdoc/qdocindexfiles.cpp
	src/widgets/kernel/qwidget_qpa.cpp

Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67

1 files changed, 7 insertions, 5 deletions

diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 5e2fc1233d..472e0cb98c 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -111,13 +111,15 @@ static inline void qt_socket_getPortAndAddress(const qt_sockaddr *s, quint16 *po
             QHostAddress tmpAddress;
             tmpAddress.setAddress(tmp);
             *addr = tmpAddress;
+            if (s->a6.sin6_scope_id) {
 #ifndef QT_NO_IPV6IFNAME
-            char scopeid[IFNAMSIZ];
-            if (::if_indextoname(s->a6.sin6_scope_id, scopeid)) {
-                addr->setScopeId(QLatin1String(scopeid));
-            } else
+                char scopeid[IFNAMSIZ];
+                if (::if_indextoname(s->a6.sin6_scope_id, scopeid)) {
+                    addr->setScopeId(QLatin1String(scopeid));
+                } else
 #endif
-            addr->setScopeId(QString::number(s->a6.sin6_scope_id));
+                    addr->setScopeId(QString::number(s->a6.sin6_scope_id));
+            }
         }
         if (port)
             *port = ntohs(s->a6.sin6_port);