diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-06-28 12:53:40 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-07-05 13:44:59 +0000 |
| commit | 594fe5c4636cb783bb7840efff4171e772ae906a (patch) | |
| tree | 7e4726ae4be5411e80aec1502e8341dde47665e4 /src/network/socket/qlocalsocket.h | |
| parent | d78fd6a1e5128756d1bfb05c0402dae0da8c172e (diff) | |
Convert features.localserver to QT_[REQUIRE_]CONFIG
Move all the logic into socket.pri and clean-up source
code. Build local socket/server only if feature 'localserver'
was enabled.
Task-number: QTBUG-61672
Change-Id: I9f9d1a262df4bb020c8706c7cb5a66b926e0240f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/network/socket/qlocalsocket.h')
| -rw-r--r-- | src/network/socket/qlocalsocket.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index ea074db90e..9905d3a86c 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -44,10 +44,9 @@ #include <QtCore/qiodevice.h> #include <QtNetwork/qabstractsocket.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(localserver); -#ifndef QT_NO_LOCALSOCKET +QT_BEGIN_NAMESPACE class QLocalSocketPrivate; @@ -148,8 +147,6 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketError); Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketState); #endif -#endif // QT_NO_LOCALSOCKET - QT_END_NAMESPACE #endif // QLOCALSOCKET_H |