1 files changed, 18 insertions, 11 deletions

diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 4ff077c3c2..c03076d98e 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -1,9 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <qglobal.h>
-// To prevent windows system header files from re-defining min/max
-#define NOMINMAX 1
 #if defined(_WIN32)
 #include <winsock2.h>
 #else
@@ -140,7 +138,8 @@ void tst_QTcpServer::initTestCase()
 #ifdef QT_TEST_SERVER
     QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::socksProxyServerName(), 1080));
     QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpProxyServerName(), 3128));
-    QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::ftpProxyServerName(), 2121));
+    // FTP currently not supported:
+    // QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::ftpProxyServerName(), 2121));
     QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::imapServerName(), 143));
 #else
     if (!QtNetworkSettings::verifyTestNetworkSettings())
@@ -735,6 +734,7 @@ void tst_QTcpServer::proxyFactory_data()
         << proxyList << proxyList.at(1)
         << false << int(QAbstractSocket::UnknownSocketError);
 
+#if 0 // ftp not currently supported
     proxyList.clear();
     proxyList << QNetworkProxy(QNetworkProxy::FtpCachingProxy, QtNetworkSettings::ftpProxyServerName(), 2121)
               << QNetworkProxy(QNetworkProxy::HttpCachingProxy, QtNetworkSettings::httpProxyServerName(), 3128)
@@ -742,6 +742,7 @@ void tst_QTcpServer::proxyFactory_data()
     QTest::newRow("ftp+cachinghttp+socks5")
         << proxyList << proxyList.at(2)
         << false << int(QAbstractSocket::UnknownSocketError);
+#endif
 
     // tests that fail to listen
     proxyList.clear();
@@ -756,6 +757,7 @@ void tst_QTcpServer::proxyFactory_data()
         << proxyList << QNetworkProxy()
         << true << int(QAbstractSocket::UnsupportedSocketOperationError);
 
+#if 0 // ftp not currently supported
     proxyList.clear();
     proxyList << QNetworkProxy(QNetworkProxy::FtpCachingProxy, QtNetworkSettings::ftpProxyServerName(), 2121);
     QTest::newRow("ftp")
@@ -768,6 +770,7 @@ void tst_QTcpServer::proxyFactory_data()
     QTest::newRow("ftp+cachinghttp")
         << proxyList << QNetworkProxy()
         << true << int(QAbstractSocket::UnsupportedSocketOperationError);
+#endif
 }
 
 void tst_QTcpServer::proxyFactory()
@@ -862,10 +865,12 @@ void tst_QTcpServer::serverAddress_data()
     QTest::newRow("AnyIPv4") << QHostAddress(QHostAddress::AnyIPv4) << QHostAddress(QHostAddress::AnyIPv4);
     if (QtNetworkSettings::hasIPv6())
         QTest::newRow("AnyIPv6") << QHostAddress(QHostAddress::AnyIPv6) << QHostAddress(QHostAddress::AnyIPv6);
-    foreach (const QNetworkInterface &iface, QNetworkInterface::allInterfaces()) {
+    const auto ifaces = QNetworkInterface::allInterfaces();
+    for (const QNetworkInterface &iface : ifaces) {
         if ((iface.flags() & QNetworkInterface::IsUp) == 0)
             continue;
-        foreach (const QNetworkAddressEntry &entry, iface.addressEntries()) {
+        const auto entries = iface.addressEntries();
+        for (const QNetworkAddressEntry &entry : entries) {
             QTest::newRow(qPrintable(entry.ip().toString())) << entry.ip() << entry.ip();
         }
     }
@@ -919,7 +924,8 @@ void tst_QTcpServer::linkLocal()
     QSet <QString> scopes;
     QHostAddress localMaskv4("169.254.0.0");
     QHostAddress localMaskv6("fe80::");
-    foreach (const QNetworkInterface& iface, QNetworkInterface::allInterfaces()) {
+    const auto ifaces = QNetworkInterface::allInterfaces();
+    for (const QNetworkInterface &iface : ifaces) {
         //Windows preallocates link local addresses to interfaces that are down.
         //These may or may not work depending on network driver (they do not work for the Bluetooth PAN driver)
         if (iface.flags() & QNetworkInterface::IsUp) {
@@ -939,7 +945,8 @@ void tst_QTcpServer::linkLocal()
             if (iface.name().startsWith("awdl"))
                 continue;
 #endif
-            foreach (QNetworkAddressEntry addressEntry, iface.addressEntries()) {
+            const auto entries = iface.addressEntries();
+            for (const QNetworkAddressEntry &addressEntry : entries) {
                 QHostAddress addr = addressEntry.ip();
                 if (addr.isInSubnet(localMaskv4, 16)) {
                     addresses << addr;
@@ -958,7 +965,7 @@ void tst_QTcpServer::linkLocal()
 
     QList<QTcpServer*> servers;
     quint16 port = 0;
-    foreach (const QHostAddress& addr, addresses) {
+    for (const QHostAddress &addr : std::as_const(addresses)) {
         QTcpServer *server = new QTcpServer;
         QVERIFY(server->listen(addr, port));
         port = server->serverPort(); //listen to same port on different interfaces
@@ -966,7 +973,7 @@ void tst_QTcpServer::linkLocal()
     }
 
     QList<QTcpSocket*> clients;
-    foreach (const QHostAddress& addr, addresses) {
+    for (const QHostAddress &addr : std::as_const(addresses)) {
         //unbound socket
         QTcpSocket *socket = new QTcpSocket;
         socket->connectToHost(addr, port);
@@ -981,7 +988,7 @@ void tst_QTcpServer::linkLocal()
     }
 
     //each server should have two connections
-    foreach (QTcpServer* server, servers) {
+    for (QTcpServer *server : std::as_const(servers)) {
         //qDebug() << "checking for connections" << server->serverAddress() << ":" << server->serverPort();
         QVERIFY(server->waitForNewConnection(5000));
         QTcpSocket* remote = server->nextPendingConnection();