Qt5 update to 5.13.0

For new features, check: https://wiki.qt.io/New_Features_in_Qt_5.13

Thanks to adridg who helped to fix a lot of packages.

Exp-run by:	antoine
PR:		238782

7 files changed, 5 insertions, 332 deletions

diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
index 517295725671..3918871f81c0 100644
--- a/net/qt5-network/Makefile
+++ b/net/qt5-network/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	network
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	2
 CATEGORIES=	net ipv6
 PKGNAMEPREFIX=	qt5-
 
diff --git a/net/qt5-network/files/patch-qdnslookup b/net/qt5-network/files/patch-qdnslookup
deleted file mode 100644
index cf0a0e5ce227..000000000000
--- a/net/qt5-network/files/patch-qdnslookup
+++ /dev/null
@@ -1,109 +0,0 @@
-QDnsLookup: fix "Resolver functions not found" error on FreeBSD
-
-The current code only tries to load the required functions from
-LIBRESOLV_SO (if defined) and resolv, but on FreeBSD they are in libc:
-https://www.freebsd.org/cgi/man.cgi?query=res_query&sektion=3&apropos=0&manpath=freebsd
-
-This commit changes the code so that, after failing to load the
-non-existent libraries, it attempts to load the functions with dlsym()
-using the special handle RTLD_DEFAULT, which searches for the specified
-symbol in the loaded libraries.
-
-Task-number: QTBUG-74844
-
-diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
-index 11b80d59d5e..d7a92a12ebe 100644
---- src/network/kernel/kernel.pri
-+++ src/network/kernel/kernel.pri
-@@ -38,7 +38,11 @@ qtConfig(dnslookup) {
- }
- 
- unix {
--    !integrity:qtConfig(dnslookup): SOURCES += kernel/qdnslookup_unix.cpp
-+    !integrity:qtConfig(dnslookup) {
-+        SOURCES += kernel/qdnslookup_unix.cpp
-+        qtConfig(dlopen): QMAKE_USE_PRIVATE += libdl
-+    }
-+
-     SOURCES += kernel/qhostinfo_unix.cpp
- 
-     qtConfig(linux-netlink): SOURCES += kernel/qnetworkinterface_linux.cpp
-diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp
-index ce1ec6442a6..ee7484ab35f 100644
---- src/network/kernel/qdnslookup_unix.cpp
-+++ src/network/kernel/qdnslookup_unix.cpp
-@@ -59,6 +59,10 @@
- #  include <gnu/lib-names.h>
- #endif
- 
-+#if defined(Q_OS_FREEBSD) || QT_CONFIG(dlopen)
-+#  include <dlfcn.h>
-+#endif
-+
- #include <cstring>
- 
- QT_BEGIN_NAMESPACE
-@@ -87,6 +91,18 @@ struct QDnsLookupStateDeleter
-     }
- };
- 
-+static QFunctionPointer resolveSymbol(QLibrary &lib, const char *sym)
-+{
-+    if (lib.isLoaded())
-+        return lib.resolve(sym);
-+
-+#if defined(RTLD_DEFAULT) && (defined(Q_OS_FREEBSD) || QT_CONFIG(dlopen))
-+    return reinterpret_cast<QFunctionPointer>(dlsym(RTLD_DEFAULT, sym));
-+#else
-+    return nullptr;
-+#endif
-+}
-+
- static bool resolveLibraryInternal()
- {
-     QLibrary lib;
-@@ -96,31 +112,30 @@ static bool resolveLibraryInternal()
- #endif
-     {
-         lib.setFileName(QLatin1String("resolv"));
--        if (!lib.load())
--            return false;
-+        lib.load();
-     }
- 
--    local_dn_expand = dn_expand_proto(lib.resolve("__dn_expand"));
-+    local_dn_expand = dn_expand_proto(resolveSymbol(lib, "__dn_expand"));
-     if (!local_dn_expand)
--        local_dn_expand = dn_expand_proto(lib.resolve("dn_expand"));
-+        local_dn_expand = dn_expand_proto(resolveSymbol(lib, "dn_expand"));
- 
--    local_res_nclose = res_nclose_proto(lib.resolve("__res_nclose"));
-+    local_res_nclose = res_nclose_proto(resolveSymbol(lib, "__res_nclose"));
-     if (!local_res_nclose)
--        local_res_nclose = res_nclose_proto(lib.resolve("res_9_nclose"));
-+        local_res_nclose = res_nclose_proto(resolveSymbol(lib, "res_9_nclose"));
-     if (!local_res_nclose)
--        local_res_nclose = res_nclose_proto(lib.resolve("res_nclose"));
-+        local_res_nclose = res_nclose_proto(resolveSymbol(lib, "res_nclose"));
- 
--    local_res_ninit = res_ninit_proto(lib.resolve("__res_ninit"));
-+    local_res_ninit = res_ninit_proto(resolveSymbol(lib, "__res_ninit"));
-     if (!local_res_ninit)
--        local_res_ninit = res_ninit_proto(lib.resolve("res_9_ninit"));
-+        local_res_ninit = res_ninit_proto(resolveSymbol(lib, "res_9_ninit"));
-     if (!local_res_ninit)
--        local_res_ninit = res_ninit_proto(lib.resolve("res_ninit"));
-+        local_res_ninit = res_ninit_proto(resolveSymbol(lib, "res_ninit"));
- 
--    local_res_nquery = res_nquery_proto(lib.resolve("__res_nquery"));
-+    local_res_nquery = res_nquery_proto(resolveSymbol(lib, "__res_nquery"));
-     if (!local_res_nquery)
--        local_res_nquery = res_nquery_proto(lib.resolve("res_9_nquery"));
-+        local_res_nquery = res_nquery_proto(resolveSymbol(lib, "res_9_nquery"));
-     if (!local_res_nquery)
--        local_res_nquery = res_nquery_proto(lib.resolve("res_nquery"));
-+        local_res_nquery = res_nquery_proto(resolveSymbol(lib, "res_nquery"));
- 
-     return true;
- }
-
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
deleted file mode 100644
index 760df9a136af..000000000000
--- a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-* 
-* Fix for libressl after openssl111 API change
-*
-*
---- src/network/ssl/qsslcontext_openssl.cpp.orig	2018-12-03 11:15:26 UTC
-+++ src/network/ssl/qsslcontext_openssl.cpp
-@@ -249,7 +249,7 @@ void QSslContext::applyBackendConfig(QSs
-     if (sslContext->sslConfiguration.backendConfiguration().isEmpty())
-         return;
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-     if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
-         QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-         if (cctx) {
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h
deleted file mode 100644
index 7e5db51ed696..000000000000
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h
+++ /dev/null
@@ -1,71 +0,0 @@
-For LibreSSL, redefine OPENSSL_STACK to use the native stack_st.
-Also redefine DSA_bits() to a LibreSSL-native routine.
-
-Redefine SSL stack functions to their proper symbols in LibreSSL.
-
---- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig	2018-12-03 11:15:26 UTC
-+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
-@@ -75,21 +75,49 @@
- #error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead"
- #endif
- 
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
-+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
-+typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
-+// From the signature in LibreSSL
-+#define OPENSSL_INIT_SETTINGS void
-+// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63
-+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
-+#endif
-+
- const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- 
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#else
- int q_DSA_bits(DSA *a);
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+#ifdef LIBRESSL_VERSION_NUMBER
-+int q_sk_num(OPENSSL_STACK *a);
-+void q_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
-+OPENSSL_STACK *q_sk_new_null();
-+void q_sk_push(OPENSSL_STACK *st, void *data);
-+void q_sk_free(OPENSSL_STACK *a);
-+void * q_sk_value(OPENSSL_STACK *a, int b);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+#define q_OPENSSL_sk_push(a, b) q_sk_push(a, b)
-+#define q_OPENSSL_sk_free q_sk_free
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#else
- int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- OPENSSL_STACK *q_OPENSSL_sk_new_null();
- void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#endif
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -112,8 +140,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#else
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#endif
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
deleted file mode 100644
index c09b2b96c983..000000000000
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-Redefine SSL stack functions to their proper symbols in LibreSSL.
-Also reference a redefined DSA_bits() that does not natively exist
-in LibreSSL.
-
-Ensure that we link to the correct ssl library selected in
-DEFAULT_VERSIONS.
-
-Do not define SSL_CONF_CTX symbols absent from LibreSSL.
-
---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2018-12-03 11:15:26 UTC
-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -152,6 +152,14 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w,
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifdef LIBRESSL_VERSION_NUMBER
-+DEFINEFUNC(int, sk_num, OPENSSL_STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(OPENSSL_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -159,6 +167,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#endif
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
- #ifdef TLS1_3_VERSION
-@@ -443,7 +452,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
-@@ -846,8 +855,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
-     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
-         return pair;
-@@ -876,8 +885,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
-     //  macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
-     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
-     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1);
-+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1);
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.0 and libcrypto.so.0 found
-         return pair;
-@@ -961,12 +970,21 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifdef LIBRESSL_VERSION_NUMBER
-+    RESOLVEFUNC(sk_new_null)
-+    RESOLVEFUNC(sk_push)
-+    RESOLVEFUNC(sk_free)
-+    RESOLVEFUNC(sk_num)
-+    RESOLVEFUNC(sk_pop_free)
-+    RESOLVEFUNC(sk_value)
-+#else
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
- #ifdef TLS1_3_VERSION
-@@ -1001,7 +1019,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -1237,7 +1257,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
deleted file mode 100644
index 75be686a5f8c..000000000000
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
+++ /dev/null
@@ -1,30 +0,0 @@
-Define maximum TLS version as 1.2 so as to not hit any possibly
-unsupported TLS 1.3 symbols.
-
-Also do not define SSL_CONF_CTX symbols absent from LibreSSL.
-
---- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2018-12-03 11:15:26 UTC
-+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -74,6 +74,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
-+# define TLS1_2_VERSION 0x0303
-+# define TLS_MAX_VERSION TLS1_2_VERSION
-+# define TLS_ANY_VERSION 0x10000
-+#endif
-+
-+
- #define DUMMYARG
- 
- #if !defined QT_LINKED_OPENSSL
-@@ -359,7 +366,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist
index 7fe428bcd968..01a8de349b09 100644
--- a/net/qt5-network/pkg-plist
+++ b/net/qt5-network/pkg-plist
@@ -62,6 +62,8 @@
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplywasmimpl_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocsp_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocspresponse_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsctpserver_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsctpsocket_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h
@@ -82,6 +84,7 @@
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_opensslpre11_symbols_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpserver_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpsocket_p.h
@@ -124,6 +127,7 @@
 %%QT_INCDIR%%/QtNetwork/QNetworkReply
 %%QT_INCDIR%%/QtNetwork/QNetworkRequest
 %%QT_INCDIR%%/QtNetwork/QNetworkSession
+%%QT_INCDIR%%/QtNetwork/QOcspResponse
 %%QT_INCDIR%%/QtNetwork/QSctpServer
 %%QT_INCDIR%%/QtNetwork/QSctpSocket
 %%QT_INCDIR%%/QtNetwork/QSsl
@@ -167,6 +171,7 @@
 %%QT_INCDIR%%/QtNetwork/qnetworkreply.h
 %%QT_INCDIR%%/QtNetwork/qnetworkrequest.h
 %%QT_INCDIR%%/QtNetwork/qnetworksession.h
+%%QT_INCDIR%%/QtNetwork/qocspresponse.h
 %%QT_INCDIR%%/QtNetwork/qpassworddigestor.h
 %%QT_INCDIR%%/QtNetwork/qsctpserver.h
 %%QT_INCDIR%%/QtNetwork/qsctpsocket.h