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

 Conflicts:
	examples/opengl/qopenglwidget/main.cpp
	src/3rdparty/pcre2/src/pcre2_printint.c
	src/plugins/platforms/cocoa/qnsview.mm
	src/widgets/widgets/qcombobox.cpp

Change-Id: I37ced9da1e8056f95851568bcc52cd5dc34f56af

4 files changed, 15 insertions, 17 deletions

diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index ac6bebbfae..716f745bc9 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -17,8 +17,7 @@ HEADERS += kernel/qtnetworkglobal.h \
            kernel/qnetworkdatagram_p.h \
            kernel/qnetworkinterface.h \
            kernel/qnetworkinterface_p.h \
-           kernel/qnetworkproxy.h \
-           kernel/qurlinfo_p.h
+           kernel/qnetworkproxy.h
 
 SOURCES += kernel/qauthenticator.cpp \
            kernel/qdnslookup.cpp \
@@ -26,8 +25,12 @@ SOURCES += kernel/qauthenticator.cpp \
            kernel/qhostinfo.cpp \
            kernel/qnetworkdatagram.cpp \
            kernel/qnetworkinterface.cpp \
-           kernel/qnetworkproxy.cpp \
-           kernel/qurlinfo.cpp
+           kernel/qnetworkproxy.cpp
+
+qtConfig(ftp) {
+    HEADERS += kernel/qurlinfo_p.h
+    SOURCES += kernel/qurlinfo.cpp
+}
 
 unix {
     !integrity: SOURCES += kernel/qdnslookup_unix.cpp
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 37f3f84653..6b53b4b58e 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -227,7 +227,9 @@
 #ifndef QT_NO_NETWORKPROXY
 
 #include "private/qnetworkrequest_p.h"
+#if QT_CONFIG(socks5)
 #include "private/qsocks5socketengine_p.h"
+#endif
 #include "private/qhttpsocketengine_p.h"
 #include "qauthenticator.h"
 #include "qdebug.h"
@@ -251,7 +253,7 @@ public:
         : mutex(QMutex::Recursive)
         , applicationLevelProxy(0)
         , applicationLevelProxyFactory(0)
-#ifndef QT_NO_SOCKS5
+#if QT_CONFIG(socks5)
         , socks5SocketEngineHandler(0)
 #endif
 #ifndef QT_NO_HTTP
@@ -263,7 +265,7 @@ public:
         , useSystemProxies(false)
 #endif
     {
-#ifndef QT_NO_SOCKS5
+#if QT_CONFIG(socks5)
         socks5SocketEngineHandler = new QSocks5SocketEngineHandler();
 #endif
 #ifndef QT_NO_HTTP
@@ -275,7 +277,7 @@ public:
     {
         delete applicationLevelProxy;
         delete applicationLevelProxyFactory;
-#ifndef QT_NO_SOCKS5
+#if QT_CONFIG(socks5)
         delete socks5SocketEngineHandler;
 #endif
 #ifndef QT_NO_HTTP
@@ -335,7 +337,7 @@ private:
     QMutex mutex;
     QNetworkProxy *applicationLevelProxy;
     QNetworkProxyFactory *applicationLevelProxyFactory;
-#ifndef QT_NO_SOCKS5
+#if QT_CONFIG(socks5)
     QSocks5SocketEngineHandler *socks5SocketEngineHandler;
 #endif
 #ifndef QT_NO_HTTP
diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp
index 300a51d3e7..7ae6822fb4 100644
--- a/src/network/kernel/qurlinfo.cpp
+++ b/src/network/kernel/qurlinfo.cpp
@@ -39,8 +39,6 @@
 
 #include "qurlinfo_p.h"
 
-#ifndef QT_NO_FTP
-
 #include "qurl.h"
 #include "qdir.h"
 #include <limits.h>
@@ -727,5 +725,3 @@ bool QUrlInfo::isValid() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_FTP
diff --git a/src/network/kernel/qurlinfo_p.h b/src/network/kernel/qurlinfo_p.h
index 3a430a3321..8180796f49 100644
--- a/src/network/kernel/qurlinfo_p.h
+++ b/src/network/kernel/qurlinfo_p.h
@@ -56,10 +56,9 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qiodevice.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(ftp);
 
-#ifndef QT_NO_FTP
+QT_BEGIN_NAMESPACE
 
 class QUrl;
 class QUrlInfoPrivate;
@@ -129,8 +128,6 @@ private:
     QUrlInfoPrivate *d;
 };
 
-#endif // QT_NO_FTP
-
 QT_END_NAMESPACE
 
 #endif // QURLINFO_H