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/qlocalserver.cpp | |
| 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/qlocalserver.cpp')
| -rw-r--r-- | src/network/socket/qlocalserver.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp index 94143c2dc0..3fcec954e7 100644 --- a/src/network/socket/qlocalserver.cpp +++ b/src/network/socket/qlocalserver.cpp @@ -43,8 +43,6 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_LOCALSERVER - /*! \class QLocalServer \since 4.4 @@ -496,8 +494,6 @@ bool QLocalServer::waitForNewConnection(int msec, bool *timedOut) return !d->pendingConnections.isEmpty(); } -#endif - QT_END_NAMESPACE #include "moc_qlocalserver.cpp" |