diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-06-02 15:57:46 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-03 07:56:17 +0000 |
commit | 8af681c10744ca53bc1402dfa5ece058777aaeff (patch) | |
tree | 20647941e79aa5686044d608cb75b78130af1c52 /src/network/socket | |
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 <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/network/socket')
-rw-r--r-- | src/network/socket/qabstractsocket.h | 1 | ||||
-rw-r--r-- | src/network/socket/qabstractsocket_p.h | 1 | ||||
-rw-r--r-- | src/network/socket/qabstractsocketengine_p.h | 1 | ||||
-rw-r--r-- | src/network/socket/qhttpsocketengine_p.h | 1 | ||||
-rw-r--r-- | src/network/socket/qlocalserver.h | 1 | ||||
-rw-r--r-- | src/network/socket/qlocalserver_p.h | 2 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket.h | 1 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket_p.h | 2 | ||||
-rw-r--r-- | src/network/socket/qnativesocketengine_p.h | 2 | ||||
-rw-r--r-- | src/network/socket/qnativesocketengine_winrt_p.h | 2 | ||||
-rw-r--r-- | src/network/socket/qnet_unix_p.h | 1 | ||||
-rw-r--r-- | src/network/socket/qsocks5socketengine_p.h | 1 | ||||
-rw-r--r-- | src/network/socket/qtcpserver.h | 1 | ||||
-rw-r--r-- | src/network/socket/qtcpserver_p.h | 1 | ||||
-rw-r--r-- | src/network/socket/qtcpsocket.h | 1 | ||||
-rw-r--r-- | src/network/socket/qtcpsocket_p.h | 1 | ||||
-rw-r--r-- | src/network/socket/qudpsocket.h | 1 |
17 files changed, 21 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index aabdcd4776..2c32fa046f 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 3164c96c1e..41a8cf1c6b 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 0073a8b1f2..4b835ce6ef 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 1cc168afec..87400812a7 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 52f0813746..786885b6cd 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 28d2b08902..988140c1a4 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 0eecab206b..ea074db90e 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 56f8b590f1..560d74328e 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 5a05d7c98c..8b1a272006 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 5b76c2d223..ef219e61df 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 8d2a4ae852..46fbc9757a 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 30caa4b50c..bff7e9ecac 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 90781564b4..34cf9ea9d1 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 b53f53b921..47f45a8404 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 b2c89dcad2..3c3e3b69fd 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 dfa55a6109..17c44b343c 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 f32235b5f3..6ef10e2edb 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> |