From 594fe5c4636cb783bb7840efff4171e772ae906a Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Wed, 28 Jun 2017 12:53:40 +0200
Subject: 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>
---
 src/network/socket/qlocalsocket_p.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/network/socket/qlocalsocket_p.h')

diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h
index 9da37d2af3..eb59af5577 100644
--- a/src/network/socket/qlocalsocket_p.h
+++ b/src/network/socket/qlocalsocket_p.h
@@ -53,13 +53,13 @@
 
 #include <QtNetwork/private/qtnetworkglobal_p.h>
 
-#ifndef QT_NO_LOCALSOCKET
-
 #include "qlocalsocket.h"
 #include "private/qiodevice_p.h"
 
 #include <qtimer.h>
 
+QT_REQUIRE_CONFIG(localserver);
+
 #if defined(QT_LOCALSOCKET_TCP)
 #   include "qtcpsocket.h"
 #elif defined(Q_OS_WIN)
@@ -161,7 +161,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_LOCALSOCKET
-
 #endif // QLOCALSOCKET_P_H
 
-- 
cgit v1.2.3