Add qtnetworkglobal.h and qtnetworkglobal_p.h

The new modular configuration system requires one global
header per module, that is included by all other files in
this module.

That header will later on #include the configuration file
for Qt Network. For now it defines the Q_NETWORK_EXPORT
macro for this library.

Change-Id: I9c45d425baf881c431ed71fd457c7feb2c123855
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

src/corelib/global/qglobal.h

@@ -301,15 +301,9 @@ typedef double qreal;
 #  else
 #    define Q_WIDGETS_EXPORT Q_DECL_IMPORT
 #  endif
-#  if defined(QT_BUILD_NETWORK_LIB)
-#    define Q_NETWORK_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_NETWORK_EXPORT Q_DECL_IMPORT
-#  endif
 #else
 #  define Q_CORE_EXPORT
 #  define Q_WIDGETS_EXPORT
-#  define Q_NETWORK_EXPORT
 #endif
 
 /*

src/network/access/qabstractnetworkcache.h

@@ -40,6 +40,7 @@
 #ifndef QABSTRACTNETWORKCACHE_H
 #define QABSTRACTNETWORKCACHE_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qpair.h>

src/network/access/qabstractnetworkcache_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "private/qobject_p.h"
 
 QT_BEGIN_NAMESPACE

src/network/access/qabstractprotocolhandler_p.h

@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#ifndef QT_NO_HTTP
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 
-#include <QtCore/qglobal.h>
+#ifndef QT_NO_HTTP
 
 QT_BEGIN_NAMESPACE
 

src/network/access/qftp_p.h

@@ -48,9 +48,10 @@
 // We mean it.
 //
 
-#ifndef QFTP_H
-#define QFTP_H
+#ifndef QFTP_P_H
+#define QFTP_P_H
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtCore/qstring.h>
 #include <private/qurlinfo_p.h>
 #include <QtCore/qobject.h>
@@ -172,4 +173,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QFTP_H
+#endif // QFTP_P_H

src/network/access/qhttpmultipart.h

@@ -40,6 +40,7 @@
 #ifndef QHTTPMULTIPART_H
 #define QHTTPMULTIPART_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QByteArray>
 #include <QtCore/QIODevice>

src/network/access/qhttpmultipart_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtCore/qshareddata.h"
 #include "qnetworkrequest_p.h" // for deriving QHttpPartPrivate from QNetworkHeadersPrivate
 #include "private/qobject_p.h"

src/network/access/qhttpnetworkconnection_p.h

@@ -50,6 +50,8 @@
 //
 // We mean it.
 //
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkreply.h>
 #include <QtNetwork/qabstractsocket.h>

src/network/access/qhttpnetworkconnectionchannel_p.h

@@ -50,6 +50,8 @@
 //
 // We mean it.
 //
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkreply.h>
 #include <QtNetwork/qabstractsocket.h>

src/network/access/qhttpnetworkheader_p.h

@@ -50,6 +50,9 @@
 //
 // We mean it.
 //
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #ifndef QT_NO_HTTP
 
 #include <qshareddata.h>

src/network/access/qhttpnetworkreply_p.h

@@ -50,9 +50,13 @@
 //
 // We mean it.
 //
-#include <qplatformdefs.h>
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #ifndef QT_NO_HTTP
 
+#include <qplatformdefs.h>
+
 #ifndef QT_NO_COMPRESS
 struct z_stream_s;
 #endif

src/network/access/qhttpnetworkrequest_p.h

@@ -50,6 +50,8 @@
 //
 // We mean it.
 //
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #ifndef QT_NO_HTTP
 
 #include <private/qhttpnetworkheader_p.h>

src/network/access/qhttpprotocolhandler_p.h

@@ -52,6 +52,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <private/qabstractprotocolhandler_p.h>
 
 #ifndef QT_NO_HTTP

src/network/access/qhttpthreaddelegate_p.h

@@ -52,6 +52,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QObject>
 #include <QThreadStorage>
 #include <QNetworkProxy>

src/network/access/qnetworkaccessauthenticationmanager_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkaccessmanager.h"
 #include "qnetworkaccesscache_p.h"
 #include "qnetworkaccessbackend_p.h"

src/network/access/qnetworkaccessbackend_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkreplyimpl_p.h"
 #include "QtCore/qobject.h"
 

src/network/access/qnetworkaccesscache_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtCore/qobject.h"
 #include "QtCore/qbasictimer.h"
 #include "QtCore/qbytearray.h"

src/network/access/qnetworkaccesscachebackend_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkaccessbackend_p.h"
 #include "qnetworkrequest.h"
 #include "qnetworkreply.h"

src/network/access/qnetworkaccessdebugpipebackend_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkaccessbackend_p.h"
 #include "qnetworkrequest.h"
 #include "qnetworkreply.h"

src/network/access/qnetworkaccessfilebackend_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkaccessbackend_p.h"
 #include "qnetworkrequest.h"
 #include "qnetworkreply.h"

src/network/access/qnetworkaccessftpbackend_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkaccessbackend_p.h"
 #include "qnetworkaccesscache_p.h"
 #include "qnetworkrequest.h"

src/network/access/qnetworkaccessmanager.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKACCESSMANAGER_H
 #define QNETWORKACCESSMANAGER_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QObject>
 #ifndef QT_NO_SSL
 #include <QtNetwork/QSslConfiguration>

src/network/access/qnetworkaccessmanager_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkaccessmanager.h"
 #include "qnetworkaccesscache_p.h"
 #include "qnetworkaccessbackend_p.h"

src/network/access/qnetworkcookie.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKCOOKIE_H
 #define QNETWORKCOOKIE_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QList>
 #include <QtCore/QMetaType>

src/network/access/qnetworkcookie_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtCore/qdatetime.h"
 
 QT_BEGIN_NAMESPACE

src/network/access/qnetworkcookiejar.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKCOOKIEJAR_H
 #define QNETWORKCOOKIEJAR_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
 

src/network/access/qnetworkcookiejar_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "private/qobject_p.h"
 #include "qnetworkcookie.h"
 

src/network/access/qnetworkdiskcache.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKDISKCACHE_H
 #define QNETWORKDISKCACHE_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtNetwork/qabstractnetworkcache.h>
 
 QT_BEGIN_NAMESPACE

src/network/access/qnetworkdiskcache_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "private/qabstractnetworkcache_p.h"
 
 #include <qbuffer.h>

src/network/access/qnetworkfile_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QFile>
 #include <qnetworkreply.h>
 

src/network/access/qnetworkreply.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKREPLY_H
 #define QNETWORKREPLY_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QIODevice>
 #include <QtCore/QString>
 #include <QtCore/QVariant>

src/network/access/qnetworkreply_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkrequest.h"
 #include "qnetworkrequest_p.h"
 #include "qnetworkreply.h"

src/network/access/qnetworkreplydataimpl_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkreply.h"
 #include "qnetworkreply_p.h"
 #include "qnetworkaccessmanager.h"

src/network/access/qnetworkreplyfileimpl_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkreply.h"
 #include "qnetworkreply_p.h"
 #include "qnetworkaccessmanager.h"

src/network/access/qnetworkreplyhttpimpl_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkrequest.h"
 #include "qnetworkreply.h"
 

src/network/access/qnetworkreplyimpl_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkreply.h"
 #include "qnetworkreply_p.h"
 #include "qnetworkaccessmanager.h"

src/network/access/qnetworkrequest.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKREQUEST_H
 #define QNETWORKREQUEST_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QString>
 #include <QtCore/QUrl>

src/network/access/qnetworkrequest_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkrequest.h"
 #include "QtCore/qbytearray.h"
 #include "QtCore/qlist.h"

src/network/access/qspdyprotocolhandler_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <private/qabstractprotocolhandler_p.h>
 #include <QtNetwork/qnetworkreply.h>
 #include <private/qbytedata_p.h>

src/network/bearer/qbearerengine_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkconfiguration_p.h"
 #include "qnetworksession.h"
 #include "qnetworkconfigmanager.h"

src/network/bearer/qbearerplugin_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qbearerengine_p.h"
 
 #include <QtCore/qplugin.h>

src/network/bearer/qnetworkconfigmanager.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKCONFIGMANAGER_H
 #define QNETWORKCONFIGMANAGER_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qobject.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 

src/network/bearer/qnetworkconfigmanager_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkconfigmanager.h"
 #include "qnetworkconfiguration_p.h"
 

src/network/bearer/qnetworkconfiguration.h

@@ -40,7 +40,7 @@
 #ifndef QNETWORKCONFIGURATION_H
 #define QNETWORKCONFIGURATION_H
 
-# include <QtCore/qglobal.h>
+#include <QtNetwork/qtnetworkglobal.h>
 
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>

src/network/bearer/qnetworkconfiguration_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworkconfiguration.h"
 
 #include <QtCore/qshareddata.h>

src/network/bearer/qnetworksession.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKSESSION_H
 #define QNETWORKSESSION_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 #include <QtNetwork/qnetworkinterface.h>

src/network/bearer/qnetworksession_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworksession.h"
 #include "qnetworkconfiguration_p.h"
 #include "QtCore/qsharedpointer.h"

src/network/bearer/qsharednetworksession_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qnetworksession.h"
 #include "qnetworkconfiguration.h"
 #include <QHash>

src/network/kernel/kernel.pri

@@ -3,7 +3,9 @@
 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
 INCLUDEPATH += $$PWD
 
-HEADERS += kernel/qauthenticator.h \
+HEADERS += kernel/qtnetworkglobal.h \
+           kernel/qtnetworkglobal_p.h \
+           kernel/qauthenticator.h \
 	   kernel/qauthenticator_p.h \
            kernel/qdnslookup.h \
            kernel/qdnslookup_p.h \

src/network/kernel/qauthenticator.h

@@ -40,6 +40,7 @@
 #ifndef QAUTHENTICATOR_H
 #define QAUTHENTICATOR_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qvariant.h>
 

src/network/kernel/qauthenticator_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <qhash.h>
 #include <qbytearray.h>
 #include <qstring.h>

src/network/kernel/qdnslookup.h

@@ -40,6 +40,7 @@
 #ifndef QDNSLOOKUP_H
 #define QDNSLOOKUP_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>

src/network/kernel/qdnslookup_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtCore/qmutex.h"
 #include "QtCore/qrunnable.h"
 #include "QtCore/qsharedpointer.h"

src/network/kernel/qhostaddress.h

@@ -41,6 +41,7 @@
 #ifndef QHOSTADDRESS_H
 #define QHOSTADDRESS_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qscopedpointer.h>

src/network/kernel/qhostaddress_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qhostaddress.h"
 #include "qabstractsocket.h"
 

src/network/kernel/qhostinfo.h

@@ -40,6 +40,7 @@
 #ifndef QHOSTINFO_H
 #define QHOSTINFO_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qhostaddress.h>

src/network/kernel/qhostinfo_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtCore/qcoreapplication.h"
 #include "private/qcoreapplication_p.h"
 #include "QtNetwork/qhostinfo.h"

src/network/kernel/qnetworkdatagram_p.h

@@ -45,6 +45,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtNetwork/qhostaddress.h>
 
 QT_BEGIN_NAMESPACE

src/network/kernel/qnetworkinterface.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKINTERFACE_H
 #define QNETWORKINTERFACE_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qhostaddress.h>

src/network/kernel/qnetworkinterface_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtCore/qatomic.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qreadwritelock.h>

src/network/kernel/qnetworkproxy.h

@@ -40,6 +40,7 @@
 #ifndef QNETWORKPROXY_H
 #define QNETWORKPROXY_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtNetwork/qhostaddress.h>
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtCore/qshareddata.h>

src/network/kernel/qnetworkproxy_p.h

@@ -52,6 +52,8 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #ifndef QT_NO_NETWORKPROXY
 
 QT_BEGIN_NAMESPACE

src/network/kernel/qtnetworkglobal.h

@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTNETWORKGLOBAL_H
+#define QTNETWORKGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_NETWORK_LIB)
+#    define Q_NETWORK_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_NETWORK_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_NETWORK_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+#endif
+

src/network/kernel/qtnetworkglobal_p.h

@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTNETWORKGLOBAL_P_H
+#define QTNETWORKGLOBAL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtNetwork/qtnetworkglobal.h>
+#include <QtCore/private/qglobal_p.h>
+
+#endif // QTNETWORKGLOBAL_P_H

src/network/kernel/qurlinfo_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qiodevice.h>

src/network/socket/qabstractsocket.h

@@ -40,6 +40,7 @@
 #ifndef QABSTRACTSOCKET_H
 #define QABSTRACTSOCKET_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qiodevice.h>
 #include <QtCore/qobject.h>
 #ifndef QT_NO_DEBUG_STREAM

src/network/socket/qabstractsocket_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtNetwork/qabstractsocket.h"
 #include "QtCore/qbytearray.h"
 #include "QtCore/qlist.h"

src/network/socket/qabstractsocketengine_p.h

@@ -52,6 +52,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtNetwork/qhostaddress.h"
 #include "QtNetwork/qabstractsocket.h"
 #include "private/qobject_p.h"

src/network/socket/qhttpsocketengine_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "private/qabstractsocketengine_p.h"
 #include "qabstractsocket.h"
 #include "qnetworkproxy.h"

src/network/socket/qlocalserver.h

@@ -40,6 +40,7 @@
 #ifndef QLOCALSERVER_H
 #define QLOCALSERVER_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtNetwork/qabstractsocket.h>
 
 QT_BEGIN_NAMESPACE

src/network/socket/qlocalserver_p.h

@@ -51,6 +51,8 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #ifndef QT_NO_LOCALSERVER
 
 #include "qlocalserver.h"

src/network/socket/qlocalsocket.h

@@ -40,6 +40,7 @@
 #ifndef QLOCALSOCKET_H
 #define QLOCALSOCKET_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qiodevice.h>
 #include <QtNetwork/qabstractsocket.h>
 

src/network/socket/qlocalsocket_p.h

@@ -51,6 +51,8 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #ifndef QT_NO_LOCALSOCKET
 
 #include "qlocalsocket.h"

src/network/socket/qnativesocketengine_p.h

@@ -51,6 +51,8 @@
 //
 // We mean it.
 //
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtNetwork/qhostaddress.h"
 #include "QtNetwork/qnetworkinterface.h"
 #include "private/qabstractsocketengine_p.h"

src/network/socket/qnativesocketengine_winrt_p.h

@@ -50,6 +50,8 @@
 //
 // We mean it.
 //
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtCore/QEventLoop>
 #include <QtCore/QBuffer>
 #include <QtCore/QMutex>

src/network/socket/qnet_unix_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "private/qcore_unix_p.h"
 
 #include <sys/types.h>

src/network/socket/qsocks5socketengine_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qabstractsocketengine_p.h"
 #include "qnetworkproxy.h"
 

src/network/socket/qtcpserver.h

@@ -40,6 +40,7 @@
 #ifndef QTCPSERVER_H
 #define QTCPSERVER_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qobject.h>
 #include <QtNetwork/qabstractsocket.h>
 #include <QtNetwork/qhostaddress.h>

src/network/socket/qtcpserver_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "QtNetwork/qtcpserver.h"
 #include "private/qobject_p.h"
 #include "private/qabstractsocketengine_p.h"

src/network/socket/qtcpsocket.h

@@ -40,6 +40,7 @@
 #ifndef QTCPSOCKET_H
 #define QTCPSOCKET_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtNetwork/qabstractsocket.h>
 #include <QtCore/qvariant.h>
 

src/network/socket/qtcpsocket_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtNetwork/qtcpsocket.h>
 #include <private/qabstractsocket_p.h>
 

src/network/socket/qudpsocket.h

@@ -40,6 +40,7 @@
 #ifndef QUDPSOCKET_H
 #define QUDPSOCKET_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtNetwork/qabstractsocket.h>
 #include <QtNetwork/qhostaddress.h>
 

src/network/ssl/qasn1element_p.h

@@ -52,6 +52,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qmap.h>
 

src/network/ssl/qssl.h

@@ -41,7 +41,7 @@
 #ifndef QSSL_H
 #define QSSL_H
 
-#include <QtCore/qglobal.h>
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QFlags>
 
 QT_BEGIN_NAMESPACE

src/network/ssl/qssl_p.h

@@ -53,6 +53,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtCore/QLoggingCategory>
 
 QT_BEGIN_NAMESPACE

src/network/ssl/qsslcertificate.h

@@ -45,6 +45,7 @@
 #undef verify
 #endif
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qcryptographichash.h>

src/network/ssl/qsslcertificate_p.h

@@ -41,6 +41,7 @@
 #ifndef QSSLCERTIFICATE_OPENSSL_P_H
 #define QSSLCERTIFICATE_OPENSSL_P_H
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qsslcertificate.h"
 
 //

src/network/ssl/qsslcertificateextension.h

@@ -40,6 +40,7 @@
 #ifndef QSSLCERTIFICATEEXTENSION_H
 #define QSSLCERTIFICATEEXTENSION_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>

src/network/ssl/qsslcertificateextension_p.h

@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qsslcertificateextension.h"
 
 QT_BEGIN_NAMESPACE

src/network/ssl/qsslcipher.h

@@ -41,6 +41,7 @@
 #ifndef QSSLCIPHER_H
 #define QSSLCIPHER_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qssl.h>

src/network/ssl/qsslcipher_p.h

@@ -40,6 +40,7 @@
 #ifndef QSSLCIPHER_P_H
 #define QSSLCIPHER_P_H
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qsslcipher.h"
 
 QT_BEGIN_NAMESPACE

src/network/ssl/qsslconfiguration.h

@@ -56,6 +56,7 @@
 #ifndef QSSLCONFIGURATION_H
 #define QSSLCONFIGURATION_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qshareddata.h>
 #include <QtNetwork/qsslsocket.h>
 #include <QtNetwork/qssl.h>

src/network/ssl/qsslconfiguration_p.h

@@ -67,6 +67,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include "qsslconfiguration.h"
 #include "qlist.h"
 #include "qsslcertificate.h"

src/network/ssl/qsslcontext_openssl_p.h

@@ -53,6 +53,7 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QtCore/qvariant.h>
 #include <QtNetwork/qsslcertificate.h>
 #include <QtNetwork/qsslconfiguration.h>

src/network/ssl/qssldiffiehellmanparameters_p.h

@@ -41,8 +41,6 @@
 #ifndef QSSLDIFFIEHELLMANPARAMETERS_P_H
 #define QSSLDIFFIEHELLMANPARAMETERS_P_H
 
-#include "qsslkey.h"
-
 //
 //  W A R N I N G
 //  -------------
@@ -54,8 +52,10 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
 #include <QSharedData>
 
+#include "qsslkey.h"
 #include "qssldiffiehellmanparameters.h"
 #include "qsslsocket_p.h" // includes wincrypt.h
 

src/network/ssl/qsslellipticcurve.h

@@ -40,7 +40,7 @@
 #ifndef QSSLELLIPTICCURVE_H
 #define QSSLELLIPTICCURVE_H
 
-#include <QtCore/QtGlobal>
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QString>
 #include <QtCore/QMetaType>
 #if QT_DEPRECATED_SINCE(5, 6)

src/network/ssl/qsslerror.h

@@ -41,6 +41,7 @@
 #ifndef QSSLERROR_H
 #define QSSLERROR_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qvariant.h>
 #include <QtNetwork/qsslcertificate.h>
 

src/network/ssl/qsslkey.h

@@ -41,6 +41,7 @@
 #ifndef QSSLKEY_H
 #define QSSLKEY_H
 
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qsharedpointer.h>

src/network/ssl/qsslkey_p.h

@@ -41,8 +41,6 @@
 #ifndef QSSLKEY_OPENSSL_P_H
 #define QSSLKEY_OPENSSL_P_H
 
-#include "qsslkey.h"
-
 //
 //  W A R N I N G
 //  -------------
@@ -54,6 +52,8 @@
 // We mean it.
 //
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+#include "qsslkey.h"
 #include "qsslsocket_p.h" // includes wincrypt.h
 
 #ifndef QT_NO_OPENSSL

src/network/ssl/qsslpresharedkeyauthenticator.h

@@ -40,7 +40,7 @@
 #ifndef QSSLPRESHAREDKEYAUTHENTICATOR_H
 #define QSSLPRESHAREDKEYAUTHENTICATOR_H
 
-#include <QtCore/QtGlobal>
+#include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QString>
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QMetaType>