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

Conflicts:
    src/widgets/widgets/qmainwindowlayout.cpp

Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6

9 files changed, 33 insertions, 65 deletions

diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp
index 219a19f8b1..a9789b7d04 100644
--- a/src/network/socket/qlocalserver.cpp
+++ b/src/network/socket/qlocalserver.cpp
@@ -47,8 +47,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_LOCALSERVER
-
 /*!
     \class QLocalServer
     \since 4.4
@@ -536,8 +534,6 @@ bool QLocalServer::waitForNewConnection(int msec, bool *timedOut)
     return !d->pendingConnections.isEmpty();
 }
 
-#endif
-
 QT_END_NAMESPACE
 
 #include "moc_qlocalserver.cpp"
diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h
index 2341fd40d4..454ac30c9b 100644
--- a/src/network/socket/qlocalserver.h
+++ b/src/network/socket/qlocalserver.h
@@ -43,10 +43,9 @@
 #include <QtNetwork/qtnetworkglobal.h>
 #include <QtNetwork/qabstractsocket.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(localserver);
 
-#ifndef QT_NO_LOCALSERVER
+QT_BEGIN_NAMESPACE
 
 class QLocalSocket;
 class QLocalServerPrivate;
@@ -105,8 +104,6 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QLocalServer::SocketOptions)
 
-#endif // QT_NO_LOCALSERVER
-
 QT_END_NAMESPACE
 
 #endif // QLOCALSERVER_H
diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h
index 988140c1a4..2c073908cb 100644
--- a/src/network/socket/qlocalserver_p.h
+++ b/src/network/socket/qlocalserver_p.h
@@ -53,12 +53,12 @@
 
 #include <QtNetwork/private/qtnetworkglobal_p.h>
 
-#ifndef QT_NO_LOCALSERVER
-
 #include "qlocalserver.h"
 #include "private/qobject_p.h"
 #include <qqueue.h>
 
+QT_REQUIRE_CONFIG(localserver);
+
 #if defined(QT_LOCALSOCKET_TCP)
 #   include <qtcpserver.h>
 #elif defined(Q_OS_WIN)
@@ -128,7 +128,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_LOCALSERVER
-
 #endif // QLOCALSERVER_P_H
 
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index ba987007d3..516fac681c 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -44,8 +44,6 @@
 #include "qnet_unix_p.h"
 #include "qtemporarydir.h"
 
-#ifndef QT_NO_LOCALSERVER
-
 #include <sys/socket.h>
 #include <sys/un.h>
 
@@ -341,5 +339,3 @@ void QLocalServerPrivate::setError(const QString &function)
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_LOCALSERVER
diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp
index 4dad5a6eba..6fec2fdbd2 100644
--- a/src/network/socket/qlocalsocket.cpp
+++ b/src/network/socket/qlocalsocket.cpp
@@ -40,8 +40,6 @@
 #include "qlocalsocket.h"
 #include "qlocalsocket_p.h"
 
-#ifndef QT_NO_LOCALSOCKET
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -574,6 +572,4 @@ QDebug operator<<(QDebug debug, QLocalSocket::LocalSocketState state)
 
 QT_END_NAMESPACE
 
-#endif
-
 #include "moc_qlocalsocket.cpp"
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h
index ea074db90e..9905d3a86c 100644
--- a/src/network/socket/qlocalsocket.h
+++ b/src/network/socket/qlocalsocket.h
@@ -44,10 +44,9 @@
 #include <QtCore/qiodevice.h>
 #include <QtNetwork/qabstractsocket.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(localserver);
 
-#ifndef QT_NO_LOCALSOCKET
+QT_BEGIN_NAMESPACE
 
 class QLocalSocketPrivate;
 
@@ -148,8 +147,6 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketError);
 Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketState);
 #endif
 
-#endif // QT_NO_LOCALSOCKET
-
 QT_END_NAMESPACE
 
 #endif // QLOCALSOCKET_H
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h
index 9da37d2af3..eb59af5577 100644
--- a/src/network/socket/qlocalsocket_p.h
+++ b/src/network/socket/qlocalsocket_p.h
@@ -53,13 +53,13 @@
 
 #include <QtNetwork/private/qtnetworkglobal_p.h>
 
-#ifndef QT_NO_LOCALSOCKET
-
 #include "qlocalsocket.h"
 #include "private/qiodevice_p.h"
 
 #include <qtimer.h>
 
+QT_REQUIRE_CONFIG(localserver);
+
 #if defined(QT_LOCALSOCKET_TCP)
 #   include "qtcpsocket.h"
 #elif defined(Q_OS_WIN)
@@ -161,7 +161,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_LOCALSOCKET
-
 #endif // QLOCALSOCKET_P_H
 
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index c7997091a7..c1d79e8137 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -41,8 +41,6 @@
 #include "qlocalsocket_p.h"
 #include "qnet_unix_p.h"
 
-#ifndef QT_NO_LOCALSOCKET
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -555,5 +553,3 @@ bool QLocalSocket::waitForReadyRead(int msecs)
 }
 
 QT_END_NAMESPACE
-
-#endif
diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri
index 18a8153f56..b2ee1a8054 100644
--- a/src/network/socket/socket.pri
+++ b/src/network/socket/socket.pri
@@ -8,10 +8,6 @@ HEADERS += socket/qabstractsocketengine_p.h \
            socket/qudpsocket.h \
            socket/qtcpserver.h \
            socket/qtcpsocket_p.h \
-           socket/qlocalserver.h \
-           socket/qlocalserver_p.h \
-           socket/qlocalsocket.h \
-           socket/qlocalsocket_p.h \
            socket/qtcpserver_p.h
 
 SOURCES += socket/qabstractsocketengine.cpp \
@@ -19,9 +15,7 @@ SOURCES += socket/qabstractsocketengine.cpp \
            socket/qabstractsocket.cpp \
            socket/qtcpsocket.cpp \
            socket/qudpsocket.cpp \
-           socket/qtcpserver.cpp \
-           socket/qlocalsocket.cpp \
-           socket/qlocalserver.cpp
+           socket/qtcpserver.cpp
 
 # SOCK5 support.
 
@@ -49,42 +43,42 @@ qtConfig(sctp) {
     HEADERS += socket/qnativesocketengine_p.h
 }
 
-unix: {
-    SOURCES += socket/qnativesocketengine_unix.cpp \
-                socket/qlocalsocket_unix.cpp \
-                socket/qlocalserver_unix.cpp
+unix {
+    SOURCES += socket/qnativesocketengine_unix.cpp
+    HEADERS += socket/qnet_unix_p.h
 }
 
-unix:HEADERS += \
-                socket/qnet_unix_p.h
-
 # Suppress deprecation warnings with moc because MS headers have
 # invalid C/C++ code otherwise.
 msvc: QMAKE_MOC_OPTIONS += -D_WINSOCK_DEPRECATED_NO_WARNINGS
 
-win32:!winrt:SOURCES += socket/qnativesocketengine_win.cpp \
-                socket/qlocalsocket_win.cpp \
-                socket/qlocalserver_win.cpp
-
+win32:!winrt:SOURCES += socket/qnativesocketengine_win.cpp
 win32:!winrt:LIBS_PRIVATE += -ladvapi32
 
 winrt {
-    SOURCES += socket/qnativesocketengine_winrt.cpp \
-               socket/qlocalsocket_tcp.cpp \
-               socket/qlocalserver_tcp.cpp
+    SOURCES += socket/qnativesocketengine_winrt.cpp
     HEADERS += socket/qnativesocketengine_winrt_p.h
-
-    DEFINES += QT_LOCALSOCKET_TCP
 }
 
-integrity: {
-    SOURCES -= socket/qlocalsocket_unix.cpp \
-               socket/qlocalserver_unix.cpp
-    SOURCES += socket/qlocalsocket_tcp.cpp \
-               socket/qlocalserver_tcp.cpp \
-	       socket/qnativesocketengine_unix.cpp
-
-    DEFINES += QT_LOCALSOCKET_TCP
+qtConfig(localserver) {
+    HEADERS += socket/qlocalserver.h \
+               socket/qlocalserver_p.h \
+               socket/qlocalsocket.h \
+               socket/qlocalsocket_p.h
+    SOURCES += socket/qlocalsocket.cpp \
+               socket/qlocalserver.cpp
+
+    intergrity|winrt {
+        SOURCES += socket/qlocalsocket_tcp.cpp \
+                   socket/qlocalserver_tcp.cpp
+        DEFINES += QT_LOCALSOCKET_TCP
+    } else: unix {
+        SOURCES += socket/qlocalsocket_unix.cpp \
+                   socket/qlocalserver_unix.cpp
+    } else: win32 {
+        SOURCES += socket/qlocalsocket_win.cpp \
+                   socket/qlocalserver_win.cpp
+    }
 }
 
 qtConfig(system-proxies) {