diff options
| author | Lars Knoll <[email protected]> | 2016-06-02 15:57:46 +0200 |
|---|---|---|
| committer | Lars Knoll <[email protected]> | 2016-07-03 07:56:17 +0000 |
| commit | 8af681c10744ca53bc1402dfa5ece058777aaeff (patch) | |
| tree | 20647941e79aa5686044d608cb75b78130af1c52 | |
| parent | e8fe65205cb519de83685376d8441ffda2c1974e (diff) | |
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 <[email protected]>
107 files changed, 243 insertions, 21 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index fb31cd0816d..70ed3881492 100644 --- a/src/corelib/global/qglobal.h +++ b/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 /* diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h index 6b80147757e..33b0bc4ce39 100644 --- a/src/network/access/qabstractnetworkcache.h +++ b/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> diff --git a/src/network/access/qabstractnetworkcache_p.h b/src/network/access/qabstractnetworkcache_p.h index 7be89f22b67..fee723e3155 100644 --- a/src/network/access/qabstractnetworkcache_p.h +++ b/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 diff --git a/src/network/access/qabstractprotocolhandler_p.h b/src/network/access/qabstractprotocolhandler_p.h index a05df3e4295..30814d67378 100644 --- a/src/network/access/qabstractprotocolhandler_p.h +++ b/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 diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h index 37f8f2f8d25..6cf51167989 100644 --- a/src/network/access/qftp_p.h +++ b/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 diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h index cbf28c083ed..6d4531b0995 100644 --- a/src/network/access/qhttpmultipart.h +++ b/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> diff --git a/src/network/access/qhttpmultipart_p.h b/src/network/access/qhttpmultipart_p.h index 875f52f8e3c..a03df9cb13e 100644 --- a/src/network/access/qhttpmultipart_p.h +++ b/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" diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index e05bc1df749..fefd5af2812 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/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> diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index b3b52a7f424..d7d5d86a7af 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/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> diff --git a/src/network/access/qhttpnetworkheader_p.h b/src/network/access/qhttpnetworkheader_p.h index 3eaab587a0d..89169b93313 100644 --- a/src/network/access/qhttpnetworkheader_p.h +++ b/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> diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index da39633dd19..dea13834edb 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/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 diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index d9540e6369e..d85f8ce58f1 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/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> diff --git a/src/network/access/qhttpprotocolhandler_p.h b/src/network/access/qhttpprotocolhandler_p.h index b13993778c4..863b988be3c 100644 --- a/src/network/access/qhttpprotocolhandler_p.h +++ b/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 diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h index cec125d7a57..64c58cf6488 100644 --- a/src/network/access/qhttpthreaddelegate_p.h +++ b/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> diff --git a/src/network/access/qnetworkaccessauthenticationmanager_p.h b/src/network/access/qnetworkaccessauthenticationmanager_p.h index 3d1cd6b4fbb..548675728f9 100644 --- a/src/network/access/qnetworkaccessauthenticationmanager_p.h +++ b/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" diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h index 47f58722354..7f39c942a30 100644 --- a/src/network/access/qnetworkaccessbackend_p.h +++ b/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" diff --git a/src/network/access/qnetworkaccesscache_p.h b/src/network/access/qnetworkaccesscache_p.h index 2337dd10afa..3732b5cbb49 100644 --- a/src/network/access/qnetworkaccesscache_p.h +++ b/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" diff --git a/src/network/access/qnetworkaccesscachebackend_p.h b/src/network/access/qnetworkaccesscachebackend_p.h index c9b8c84579b..8db1a6b1d59 100644 --- a/src/network/access/qnetworkaccesscachebackend_p.h +++ b/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" diff --git a/src/network/access/qnetworkaccessdebugpipebackend_p.h b/src/network/access/qnetworkaccessdebugpipebackend_p.h index 6f8e2488800..1d1af61dbd6 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend_p.h +++ b/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" diff --git a/src/network/access/qnetworkaccessfilebackend_p.h b/src/network/access/qnetworkaccessfilebackend_p.h index dec90062e4d..081ff2b9e77 100644 --- a/src/network/access/qnetworkaccessfilebackend_p.h +++ b/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" diff --git a/src/network/access/qnetworkaccessftpbackend_p.h b/src/network/access/qnetworkaccessftpbackend_p.h index c5beaf94e8e..cdf6b7a07f2 100644 --- a/src/network/access/qnetworkaccessftpbackend_p.h +++ b/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" diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 6df0b63ba7e..69753e3e4d0 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/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> diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h index 5f8148d6e4b..bb4641ab8b5 100644 --- a/src/network/access/qnetworkaccessmanager_p.h +++ b/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" diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index 8f4b26465ab..e462b985555 100644 --- a/src/network/access/qnetworkcookie.h +++ b/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> diff --git a/src/network/access/qnetworkcookie_p.h b/src/network/access/qnetworkcookie_p.h index 61f04e71775..13538ad2435 100644 --- a/src/network/access/qnetworkcookie_p.h +++ b/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 diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index d6370cbc052..f9c1549e206 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/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> diff --git a/src/network/access/qnetworkcookiejar_p.h b/src/network/access/qnetworkcookiejar_p.h index b6f4eb2bc01..43f189a40c6 100644 --- a/src/network/access/qnetworkcookiejar_p.h +++ b/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" diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index ad8b83a5f30..a3aa8d3a074 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/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 diff --git a/src/network/access/qnetworkdiskcache_p.h b/src/network/access/qnetworkdiskcache_p.h index 9e035863dd3..e47b93b09d0 100644 --- a/src/network/access/qnetworkdiskcache_p.h +++ b/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> diff --git a/src/network/access/qnetworkfile_p.h b/src/network/access/qnetworkfile_p.h index 7794c0f18a6..dd56b24bd82 100644 --- a/src/network/access/qnetworkfile_p.h +++ b/src/network/access/qnetworkfile_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtNetwork/private/qtnetworkglobal_p.h> #include <QFile> #include <qnetworkreply.h> diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 9aaf06a803b..1419db85976 100644 --- a/src/network/access/qnetworkreply.h +++ b/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> diff --git a/src/network/access/qnetworkreply_p.h b/src/network/access/qnetworkreply_p.h index 420b862b170..66d8c9d527e 100644 --- a/src/network/access/qnetworkreply_p.h +++ b/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" diff --git a/src/network/access/qnetworkreplydataimpl_p.h b/src/network/access/qnetworkreplydataimpl_p.h index 60d3f583cc8..c8b44d75397 100644 --- a/src/network/access/qnetworkreplydataimpl_p.h +++ b/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" diff --git a/src/network/access/qnetworkreplyfileimpl_p.h b/src/network/access/qnetworkreplyfileimpl_p.h index 1f1be40bc82..d6af66152e3 100644 --- a/src/network/access/qnetworkreplyfileimpl_p.h +++ b/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" diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index 4aba915c7d6..868fa617b6e 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/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" diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 054cbcc3a78..7cd99392d37 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/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" diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 4a90a50e533..f284c11cd4a 100644 --- a/src/network/access/qnetworkrequest.h +++ b/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> diff --git a/src/network/access/qnetworkrequest_p.h b/src/network/access/qnetworkrequest_p.h index de6941c476b..5e18da6d558 100644 --- a/src/network/access/qnetworkrequest_p.h +++ b/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" diff --git a/src/network/access/qspdyprotocolhandler_p.h b/src/network/access/qspdyprotocolhandler_p.h index aba081b9d1f..0a18505b23e 100644 --- a/src/network/access/qspdyprotocolhandler_p.h +++ b/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> diff --git a/src/network/bearer/qbearerengine_p.h b/src/network/bearer/qbearerengine_p.h index b36fedb7411..5fc2578a785 100644 --- a/src/network/bearer/qbearerengine_p.h +++ b/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" diff --git a/src/network/bearer/qbearerplugin_p.h b/src/network/bearer/qbearerplugin_p.h index caaa71ca1f4..0cdde3c06ce 100644 --- a/src/network/bearer/qbearerplugin_p.h +++ b/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> diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h index 4d841d8e338..da248bc7d0a 100644 --- a/src/network/bearer/qnetworkconfigmanager.h +++ b/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> diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h index a322fb5cfe6..a804e037a30 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.h +++ b/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" diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index 45f74029925..208f9f46923 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/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> diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h index 316000c7178..12d9676b59c 100644 --- a/src/network/bearer/qnetworkconfiguration_p.h +++ b/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> diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index 2ff1d895645..d96b8915eb0 100644 --- a/src/network/bearer/qnetworksession.h +++ b/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> diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index 45596ea003b..661587603c7 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/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" diff --git a/src/network/bearer/qsharednetworksession_p.h b/src/network/bearer/qsharednetworksession_p.h index ba4bd500ac1..001b8af02a0 100644 --- a/src/network/bearer/qsharednetworksession_p.h +++ b/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> diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index 1c97c53cc73..34d2f164e80 100644 --- a/src/network/kernel/kernel.pri +++ b/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 \ diff --git a/src/network/kernel/qauthenticator.h b/src/network/kernel/qauthenticator.h index 7f8d912b494..1032c2f501a 100644 --- a/src/network/kernel/qauthenticator.h +++ b/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> diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h index 46388a01851..8a1ee0ebe6a 100644 --- a/src/network/kernel/qauthenticator_p.h +++ b/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> diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h index bf8b6debbe9..ead5e650f52 100644 --- a/src/network/kernel/qdnslookup.h +++ b/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> diff --git a/src/network/kernel/qdnslookup_p.h b/src/network/kernel/qdnslookup_p.h index 98d828b7b56..d0702863839 100644 --- a/src/network/kernel/qdnslookup_p.h +++ b/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" diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index 8cf68765113..58af14ee336 100644 --- a/src/network/kernel/qhostaddress.h +++ b/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> diff --git a/src/network/kernel/qhostaddress_p.h b/src/network/kernel/qhostaddress_p.h index 7b43af01bbe..55c3e5afde9 100644 --- a/src/network/kernel/qhostaddress_p.h +++ b/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" diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index 42317c4c655..9b4a4853d9c 100644 --- a/src/network/kernel/qhostinfo.h +++ b/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> diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 68d7dfae5b7..ba342bf533b 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/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" diff --git a/src/network/kernel/qnetworkdatagram_p.h b/src/network/kernel/qnetworkdatagram_p.h index 7e9a14decb6..e28be095085 100644 --- a/src/network/kernel/qnetworkdatagram_p.h +++ b/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 diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h index c519de80813..c31621c3cb2 100644 --- a/src/network/kernel/qnetworkinterface.h +++ b/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> diff --git a/src/network/kernel/qnetworkinterface_p.h b/src/network/kernel/qnetworkinterface_p.h index aa21d7f92c6..2dfc93cc18f 100644 --- a/src/network/kernel/qnetworkinterface_p.h +++ b/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> diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h index e60a84fa348..c9f43725963 100644 --- a/src/network/kernel/qnetworkproxy.h +++ b/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> diff --git a/src/network/kernel/qnetworkproxy_p.h b/src/network/kernel/qnetworkproxy_p.h index 74cc4105a0b..0b0dcd3a682 100644 --- a/src/network/kernel/qnetworkproxy_p.h +++ b/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 diff --git a/src/network/kernel/qtnetworkglobal.h b/src/network/kernel/qtnetworkglobal.h new file mode 100644 index 00000000000..192601970a4 --- /dev/null +++ b/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 + diff --git a/src/network/kernel/qtnetworkglobal_p.h b/src/network/kernel/qtnetworkglobal_p.h new file mode 100644 index 00000000000..51347e440d9 --- /dev/null +++ b/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 diff --git a/src/network/kernel/qurlinfo_p.h b/src/network/kernel/qurlinfo_p.h index b239f94c319..3a430a33212 100644 --- a/src/network/kernel/qurlinfo_p.h +++ b/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> diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index aabdcd47765..2c32fa046fa 100644 --- a/src/network/socket/qabstractsocket.h +++ b/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 diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 3164c96c1e6..41a8cf1c6bf 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/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" diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h index 0073a8b1f2b..4b835ce6efd 100644 --- a/src/network/socket/qabstractsocketengine_p.h +++ b/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" diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h index 1cc168afecb..87400812a72 100644 --- a/src/network/socket/qhttpsocketengine_p.h +++ b/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" diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h index 52f08137464..786885b6cd5 100644 --- a/src/network/socket/qlocalserver.h +++ b/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 diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h index 28d2b089022..988140c1a45 100644 --- a/src/network/socket/qlocalserver_p.h +++ b/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" diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 0eecab206b1..ea074db90ee 100644 --- a/src/network/socket/qlocalsocket.h +++ b/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> diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index 56f8b590f1e..560d74328e1 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/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" diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h index 5a05d7c98cc..8b1a2720068 100644 --- a/src/network/socket/qnativesocketengine_p.h +++ b/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" diff --git a/src/network/socket/qnativesocketengine_winrt_p.h b/src/network/socket/qnativesocketengine_winrt_p.h index 5b76c2d2233..ef219e61df9 100644 --- a/src/network/socket/qnativesocketengine_winrt_p.h +++ b/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> diff --git a/src/network/socket/qnet_unix_p.h b/src/network/socket/qnet_unix_p.h index 8d2a4ae8521..46fbc9757ad 100644 --- a/src/network/socket/qnet_unix_p.h +++ b/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> diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h index 30caa4b50c0..bff7e9ecaca 100644 --- a/src/network/socket/qsocks5socketengine_p.h +++ b/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" diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h index 90781564b4c..34cf9ea9d16 100644 --- a/src/network/socket/qtcpserver.h +++ b/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> diff --git a/src/network/socket/qtcpserver_p.h b/src/network/socket/qtcpserver_p.h index b53f53b9214..47f45a8404c 100644 --- a/src/network/socket/qtcpserver_p.h +++ b/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" diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h index b2c89dcad2f..3c3e3b69fd1 100644 --- a/src/network/socket/qtcpsocket.h +++ b/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> diff --git a/src/network/socket/qtcpsocket_p.h b/src/network/socket/qtcpsocket_p.h index dfa55a61092..17c44b343c4 100644 --- a/src/network/socket/qtcpsocket_p.h +++ b/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> diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h index f32235b5f33..6ef10e2edbe 100644 --- a/src/network/socket/qudpsocket.h +++ b/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> diff --git a/src/network/ssl/qasn1element_p.h b/src/network/ssl/qasn1element_p.h index c636351bf97..f532cec5307 100644 --- a/src/network/ssl/qasn1element_p.h +++ b/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> diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h index 77428442460..c2a468c97cb 100644 --- a/src/network/ssl/qssl.h +++ b/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 diff --git a/src/network/ssl/qssl_p.h b/src/network/ssl/qssl_p.h index 85eb59ae359..83ccdc7fc3d 100644 --- a/src/network/ssl/qssl_p.h +++ b/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 diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 814c6a701d6..8b051a5c886 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/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> diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h index 8b83f754e40..616b5aec6d4 100644 --- a/src/network/ssl/qsslcertificate_p.h +++ b/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" // diff --git a/src/network/ssl/qsslcertificateextension.h b/src/network/ssl/qsslcertificateextension.h index 795dd0ce80d..2ce21126872 100644 --- a/src/network/ssl/qsslcertificateextension.h +++ b/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> diff --git a/src/network/ssl/qsslcertificateextension_p.h b/src/network/ssl/qsslcertificateextension_p.h index a7ff53d4a35..373f92a5cf9 100644 --- a/src/network/ssl/qsslcertificateextension_p.h +++ b/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 diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h index 8bb404ffa71..c6328e01691 100644 --- a/src/network/ssl/qsslcipher.h +++ b/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> diff --git a/src/network/ssl/qsslcipher_p.h b/src/network/ssl/qsslcipher_p.h index 17146173618..b8629f9f963 100644 --- a/src/network/ssl/qsslcipher_p.h +++ b/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 diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 61246e1009f..b637c4f9c7f 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/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> diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h index 139a9fc32b3..6adf2c9b545 100644 --- a/src/network/ssl/qsslconfiguration_p.h +++ b/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" diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h index ef4dc6f815f..06a31af5e56 100644 --- a/src/network/ssl/qsslcontext_openssl_p.h +++ b/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> diff --git a/src/network/ssl/qssldiffiehellmanparameters_p.h b/src/network/ssl/qssldiffiehellmanparameters_p.h index a5da4e51fca..06ecf292ff6 100644 --- a/src/network/ssl/qssldiffiehellmanparameters_p.h +++ b/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 diff --git a/src/network/ssl/qsslellipticcurve.h b/src/network/ssl/qsslellipticcurve.h index 6ee66d1ec11..0e7cc60e31d 100644 --- a/src/network/ssl/qsslellipticcurve.h +++ b/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) diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index 82db2e58e4c..d7c959423d5 100644 --- a/src/network/ssl/qsslerror.h +++ b/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> diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h index 39c3659fb8f..6de02b1e449 100644 --- a/src/network/ssl/qsslkey.h +++ b/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> diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h index c17183a0594..c93941c198c 100644 --- a/src/network/ssl/qsslkey_p.h +++ b/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 diff --git a/src/network/ssl/qsslpresharedkeyauthenticator.h b/src/network/ssl/qsslpresharedkeyauthenticator.h index f34a2cee753..a012ff489ae 100644 --- a/src/network/ssl/qsslpresharedkeyauthenticator.h +++ b/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> diff --git a/src/network/ssl/qsslpresharedkeyauthenticator_p.h b/src/network/ssl/qsslpresharedkeyauthenticator_p.h index b9aa6eb28c9..e5566c3b3c6 100644 --- a/src/network/ssl/qsslpresharedkeyauthenticator_p.h +++ b/src/network/ssl/qsslpresharedkeyauthenticator_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtNetwork/private/qtnetworkglobal_p.h> #include <QSharedData> QT_BEGIN_NAMESPACE diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 1f2ed7687bb..1b29cd46370 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -41,6 +41,7 @@ #ifndef QSSLSOCKET_H #define QSSLSOCKET_H +#include <QtNetwork/qtnetworkglobal.h> #include <QtCore/qlist.h> #include <QtCore/qregexp.h> #ifndef QT_NO_SSL diff --git a/src/network/ssl/qsslsocket_mac_p.h b/src/network/ssl/qsslsocket_mac_p.h index b96011f6556..5210fb7f30d 100644 --- a/src/network/ssl/qsslsocket_mac_p.h +++ b/src/network/ssl/qsslsocket_mac_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtNetwork/private/qtnetworkglobal_p.h> #include <QtCore/qstring.h> #include <QtCore/qglobal.h> #include <QtCore/qlist.h> diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index c6572315f01..755a08ef6ef 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -66,6 +66,7 @@ // We mean it. // +#include <QtNetwork/private/qtnetworkglobal_p.h> #include "qsslsocket_p.h" #ifdef Q_OS_WIN diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h index 8743e3acd17..f912d8609b6 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -67,6 +67,7 @@ // We mean it. // +#include <QtNetwork/private/qtnetworkglobal_p.h> #include "qsslsocket_openssl_p.h" #include <QtCore/qglobal.h> diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index e791b9d1668..696827daff9 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -54,6 +54,7 @@ // We mean it. // +#include <QtNetwork/private/qtnetworkglobal_p.h> #include <private/qtcpsocket_p.h> #include "qsslkey.h" #include "qsslconfiguration_p.h" diff --git a/src/network/ssl/qsslsocket_winrt_p.h b/src/network/ssl/qsslsocket_winrt_p.h index 3946a0e60b4..1043aeee11e 100644 --- a/src/network/ssl/qsslsocket_winrt_p.h +++ b/src/network/ssl/qsslsocket_winrt_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtNetwork/private/qtnetworkglobal_p.h> #include "qsslsocket_p.h" #include <wrl.h> |