From d8b49e6b51007d6f0a9faec82a66b95dc7ccf541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Wed, 4 Mar 2020 16:33:51 +0100
Subject: QtNetwork: Delete bearer management

All remaining pieces are gone, configuration included.

Relevant CMakeLists and configure.cmake were regenerated.

Fixes: QTBUG-76502
Change-Id: I667b5da7e3802830d236d50b5e9190c2ee9c19e2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | 13 +------------
 tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp |  1 +
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'tests/auto/network/socket')

diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 849d8b0ed1..094e28149c 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -55,12 +55,10 @@
 #include <qstringlist.h>
 #include <qplatformdefs.h>
 #include <qhostinfo.h>
+#include <qnetworkinterface.h>
 
 #include <QNetworkProxy>
 
-#include <QNetworkSession>
-#include <QNetworkConfiguration>
-#include <QNetworkConfigurationManager>
 #include "../../../network-settings.h"
 
 #if defined(Q_OS_LINUX)
@@ -123,9 +121,6 @@ private:
     bool ipv6GetsockoptionMissing(int level, int optname);
 #endif
 
-#ifndef QT_NO_BEARERMANAGEMENT
-    QNetworkSession *networkSession;
-#endif
     QString crashingServerDir;
 };
 
@@ -169,12 +164,6 @@ void tst_QTcpServer::initTestCase()
     if (!QtNetworkSettings::verifyTestNetworkSettings())
         QSKIP("No network test server available");
 #endif
-#ifndef QT_NO_BEARERMANAGEMENT
-    QNetworkConfigurationManager man;
-    networkSession = new QNetworkSession(man.defaultConfiguration(), this);
-    networkSession->open();
-    QVERIFY(networkSession->waitForOpened());
-#endif
 }
 
 void tst_QTcpServer::init()
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 6dd390ccbd..88d2c46f3d 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -52,6 +52,7 @@
 #include <QFile>
 #include <QHostAddress>
 #include <QHostInfo>
+#include <QNetworkInterface>
 #include <QMap>
 #include <QPointer>
 #if QT_CONFIG(process)
-- 
cgit v1.2.3