From b72f013fcc3977ff527fba666ab13064061c282c Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Thu, 23 Nov 2023 08:14:25 +0100
Subject: [PATCH] Remove the use of Q_NETWORK_PRIVATE_EXPORT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-117983
Change-Id: I2339dc96b49aba38169ad3e84f48c9d3c97d6117
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/network/access/qhttpheaderparser_p.h |  2 +-
 src/network/kernel/qtnetworkglobal_p.h   |  1 -
 src/network/ssl/qsslcertificate_p.h      |  4 ++--
 src/network/ssl/qtlsbackend_p.h          | 10 +++++-----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/network/access/qhttpheaderparser_p.h b/src/network/access/qhttpheaderparser_p.h
index 3b416eb618a..50ca83693a5 100644
--- a/src/network/access/qhttpheaderparser_p.h
+++ b/src/network/access/qhttpheaderparser_p.h
@@ -43,7 +43,7 @@ static constexpr int MAX_TOTAL_HEADER_SIZE = 256 * 1024;
 
 }
 
-class Q_NETWORK_PRIVATE_EXPORT QHttpHeaderParser
+class Q_NETWORK_EXPORT QHttpHeaderParser
 {
 public:
     QHttpHeaderParser();
diff --git a/src/network/kernel/qtnetworkglobal_p.h b/src/network/kernel/qtnetworkglobal_p.h
index ff2b75e3a9e..b90e675cb46 100644
--- a/src/network/kernel/qtnetworkglobal_p.h
+++ b/src/network/kernel/qtnetworkglobal_p.h
@@ -18,7 +18,6 @@
 #include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/private/qglobal_p.h>
 #include <QtNetwork/private/qtnetwork-config_p.h>
-#include <QtNetwork/private/qtnetworkexports_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
index 02cf002460b..ca59abae827 100644
--- a/src/network/ssl/qsslcertificate_p.h
+++ b/src/network/ssl/qsslcertificate_p.h
@@ -35,8 +35,8 @@ public:
     ~QSslCertificatePrivate();
 
     QList<QSslCertificateExtension> extensions() const;
-    Q_NETWORK_PRIVATE_EXPORT static bool isBlacklisted(const QSslCertificate &certificate);
-    Q_NETWORK_PRIVATE_EXPORT static QByteArray subjectInfoToString(QSslCertificate::SubjectInfo info);
+    Q_NETWORK_EXPORT static bool isBlacklisted(const QSslCertificate &certificate);
+    Q_NETWORK_EXPORT static QByteArray subjectInfoToString(QSslCertificate::SubjectInfo info);
 
     QAtomicInt ref;
     std::unique_ptr<QTlsPrivate::X509Certificate> backend;
diff --git a/src/network/ssl/qtlsbackend_p.h b/src/network/ssl/qtlsbackend_p.h
index e250aa36d76..090531014b9 100644
--- a/src/network/ssl/qtlsbackend_p.h
+++ b/src/network/ssl/qtlsbackend_p.h
@@ -57,7 +57,7 @@ class QSslKey;
 
 namespace QTlsPrivate {
 
-class Q_NETWORK_PRIVATE_EXPORT TlsKey {
+class Q_NETWORK_EXPORT TlsKey {
 public:
     virtual ~TlsKey();
 
@@ -94,7 +94,7 @@ public:
     QByteArray pemFooter() const;
 };
 
-class Q_NETWORK_PRIVATE_EXPORT X509Certificate
+class Q_NETWORK_EXPORT X509Certificate
 {
 public:
     virtual ~X509Certificate();
@@ -151,7 +151,7 @@ using X509Pkcs12ReaderPtr = bool (*)(QIODevice *device, QSslKey *key, QSslCertif
 
 #if QT_CONFIG(ssl)
 // TLS over TCP. Handshake, encryption/decryption.
-class Q_NETWORK_PRIVATE_EXPORT TlsCryptograph : public QObject
+class Q_NETWORK_EXPORT TlsCryptograph : public QObject
 {
 public:
     virtual ~TlsCryptograph();
@@ -187,7 +187,7 @@ class TlsCryptograph;
 
 #if QT_CONFIG(dtls)
 
-class Q_NETWORK_PRIVATE_EXPORT DtlsBase
+class Q_NETWORK_EXPORT DtlsBase
 {
 public:
     virtual ~DtlsBase();
@@ -217,7 +217,7 @@ public:
 };
 
 // TLS over UDP. Handshake, encryption/decryption.
-class Q_NETWORK_PRIVATE_EXPORT DtlsCryptograph : virtual public DtlsBase
+class Q_NETWORK_EXPORT DtlsCryptograph : virtual public DtlsBase
 {
 public: