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

1 files changed, 18 insertions, 7 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)