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

11 files changed, 33 insertions, 38 deletions

diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index 4281a870a7..e8669dcec8 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -1,7 +1,6 @@
 # Qt network access module
 
 HEADERS += \
-    access/qftp_p.h \
     access/qhttpnetworkheader_p.h \
     access/qhttpnetworkrequest_p.h \
     access/qhttpnetworkreply_p.h \
@@ -18,7 +17,6 @@ HEADERS += \
     access/qnetworkaccessdebugpipebackend_p.h \
     access/qnetworkaccessfilebackend_p.h \
     access/qnetworkaccesscachebackend_p.h \
-    access/qnetworkaccessftpbackend_p.h \
     access/qnetworkcookie.h \
     access/qnetworkcookie_p.h \
     access/qnetworkcookiejar.h \
@@ -33,8 +31,6 @@ HEADERS += \
     access/qnetworkreplyfileimpl_p.h \
     access/qabstractnetworkcache_p.h \
     access/qabstractnetworkcache.h \
-    access/qnetworkdiskcache_p.h \
-    access/qnetworkdiskcache.h \
     access/qhttpthreaddelegate_p.h \
     access/qhttpmultipart.h \
     access/qhttpmultipart_p.h \
@@ -45,7 +41,6 @@ HEADERS += \
     access/qhstsstore_p.h
 
 SOURCES += \
-    access/qftp.cpp \
     access/qhttpnetworkheader.cpp \
     access/qhttpnetworkrequest.cpp \
     access/qhttpnetworkreply.cpp \
@@ -61,7 +56,6 @@ SOURCES += \
     access/qnetworkaccessdebugpipebackend.cpp \
     access/qnetworkaccessfilebackend.cpp \
     access/qnetworkaccesscachebackend.cpp \
-    access/qnetworkaccessftpbackend.cpp \
     access/qnetworkcookie.cpp \
     access/qnetworkcookiejar.cpp \
     access/qnetworkrequest.cpp \
@@ -71,7 +65,6 @@ SOURCES += \
     access/qnetworkreplyhttpimpl.cpp \
     access/qnetworkreplyfileimpl.cpp \
     access/qabstractnetworkcache.cpp \
-    access/qnetworkdiskcache.cpp \
     access/qhttpthreaddelegate.cpp \
     access/qhttpmultipart.cpp \
     access/qnetworkfile.cpp \
@@ -80,6 +73,24 @@ SOURCES += \
     access/qhstspolicy.cpp \
     access/qhstsstore.cpp
 
+qtConfig(ftp) {
+    HEADERS += \
+        access/qftp_p.h \
+        access/qnetworkaccessftpbackend_p.h
+
+    SOURCES += \
+        access/qftp.cpp \
+        access/qnetworkaccessftpbackend.cpp
+}
+
+qtConfig(networkdiskcache) {
+    HEADERS += \
+        access/qnetworkdiskcache_p.h \
+        access/qnetworkdiskcache.h
+
+    SOURCES += access/qnetworkdiskcache.cpp
+}
+
 mac: LIBS_PRIVATE += -framework Security
 
 include($$PWD/../../3rdparty/zlib_dependency.pri)
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index 47579ba654..762ef00225 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -43,8 +43,6 @@
 #include "private/qftp_p.h"
 #include "qabstractsocket.h"
 
-#ifndef QT_NO_FTP
-
 #include "qcoreapplication.h"
 #include "qtcpsocket.h"
 #include "qurlinfo_p.h"
@@ -2453,5 +2451,3 @@ QT_END_NAMESPACE
 #include "qftp.moc"
 
 #include "moc_qftp_p.cpp"
-
-#endif // QT_NO_FTP
diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h
index 6cf5116798..bba1f9b09d 100644
--- a/src/network/access/qftp_p.h
+++ b/src/network/access/qftp_p.h
@@ -56,10 +56,9 @@
 #include <private/qurlinfo_p.h>
 #include <QtCore/qobject.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(ftp);
 
-#ifndef QT_NO_FTP
+QT_BEGIN_NAMESPACE
 
 class QFtpPrivate;
 
@@ -169,8 +168,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_piFtpReply(int, const QString&))
 };
 
-#endif // QT_NO_FTP
-
 QT_END_NAMESPACE
 
 #endif // QFTP_P_H
diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp
index 95d87d909c..0c9a88596d 100644
--- a/src/network/access/qnetworkaccesscachebackend.cpp
+++ b/src/network/access/qnetworkaccesscachebackend.cpp
@@ -42,7 +42,9 @@
 #include "qnetworkaccesscachebackend_p.h"
 #include "qabstractnetworkcache.h"
 #include "qfileinfo.h"
+#if QT_CONFIG(ftp)
 #include "qurlinfo_p.h"
+#endif
 #include "qdir.h"
 #include "qcoreapplication.h"
 
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 604394383d..a5e7daff11 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -39,7 +39,9 @@
 
 #include "qnetworkaccessfilebackend_p.h"
 #include "qfileinfo.h"
+#if QT_CONFIG(ftp)
 #include "qurlinfo_p.h"
+#endif
 #include "qdir.h"
 #include "private/qnoncontiguousbytedevice_p.h"
 
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index 6d1ee645fe..0df2569e87 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -43,8 +43,6 @@
 #include "private/qnoncontiguousbytedevice_p.h"
 #include <QStringList>
 
-#ifndef QT_NO_FTP
-
 QT_BEGIN_NAMESPACE
 
 enum {
@@ -382,5 +380,3 @@ void QNetworkAccessFtpBackend::ftpRawCommandReply(int code, const QString &text)
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_FTP
diff --git a/src/network/access/qnetworkaccessftpbackend_p.h b/src/network/access/qnetworkaccessftpbackend_p.h
index cdf6b7a07f..0f26d05327 100644
--- a/src/network/access/qnetworkaccessftpbackend_p.h
+++ b/src/network/access/qnetworkaccessftpbackend_p.h
@@ -60,7 +60,7 @@
 
 #include "QtCore/qpointer.h"
 
-#ifndef QT_NO_FTP
+QT_REQUIRE_CONFIG(ftp);
 
 QT_BEGIN_NAMESPACE
 
@@ -122,6 +122,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_FTP
-
 #endif
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 15a0359391..8bbef0a0d8 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -51,7 +51,9 @@
 #include "QtNetwork/qnetworksession.h"
 #include "QtNetwork/private/qsharednetworksession_p.h"
 
+#if QT_CONFIG(ftp)
 #include "qnetworkaccessftpbackend_p.h"
+#endif
 #include "qnetworkaccessfilebackend_p.h"
 #include "qnetworkaccessdebugpipebackend_p.h"
 #include "qnetworkaccesscachebackend_p.h"
@@ -76,9 +78,9 @@
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QNetworkAccessFileBackendFactory, fileBackend)
-#ifndef QT_NO_FTP
+#if QT_CONFIG(ftp)
 Q_GLOBAL_STATIC(QNetworkAccessFtpBackendFactory, ftpBackend)
-#endif // QT_NO_FTP
+#endif // QT_CONFIG(ftp)
 
 #ifdef QT_BUILD_INTERNAL
 Q_GLOBAL_STATIC(QNetworkAccessDebugPipeBackendFactory, debugpipeBackend)
@@ -146,7 +148,7 @@ bool getProxyAuth(const QString& proxyHostname, const QString &scheme, QString&
 
 static void ensureInitialized()
 {
-#ifndef QT_NO_FTP
+#if QT_CONFIG(ftp)
     (void) ftpBackend();
 #endif
 
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index d72791c1f0..fca880d9b3 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -60,8 +60,6 @@
 
 #define MAX_COMPRESSION_SIZE (1024 * 1024 * 3)
 
-#ifndef QT_NO_NETWORKDISKCACHE
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -737,5 +735,3 @@ bool QCacheItem::read(QFile *device, bool readData)
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_NETWORKDISKCACHE
diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h
index a3aa8d3a07..0e9258f6de 100644
--- a/src/network/access/qnetworkdiskcache.h
+++ b/src/network/access/qnetworkdiskcache.h
@@ -43,10 +43,9 @@
 #include <QtNetwork/qtnetworkglobal.h>
 #include <QtNetwork/qabstractnetworkcache.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(networkdiskcache);
 
-#ifndef QT_NO_NETWORKDISKCACHE
+QT_BEGIN_NAMESPACE
 
 class QNetworkDiskCachePrivate;
 class Q_NETWORK_EXPORT QNetworkDiskCache : public QAbstractNetworkCache
@@ -84,8 +83,6 @@ private:
     Q_DISABLE_COPY(QNetworkDiskCache)
 };
 
-#endif // QT_NO_NETWORKDISKCACHE
-
 QT_END_NAMESPACE
 
 #endif // QNETWORKDISKCACHE_H
diff --git a/src/network/access/qnetworkdiskcache_p.h b/src/network/access/qnetworkdiskcache_p.h
index e47b93b09d..f7988e7dda 100644
--- a/src/network/access/qnetworkdiskcache_p.h
+++ b/src/network/access/qnetworkdiskcache_p.h
@@ -58,7 +58,7 @@
 #include <qhash.h>
 #include <qtemporaryfile.h>
 
-#ifndef QT_NO_NETWORKDISKCACHE
+QT_REQUIRE_CONFIG(networkdiskcache);
 
 QT_BEGIN_NAMESPACE
 
@@ -123,6 +123,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_NETWORKDISKCACHE
-
 #endif // QNETWORKDISKCACHE_P_H