From a55c9dbabc885be757882746a1856e4e5c2dd078 Mon Sep 17 00:00:00 2001
From: Juha Vuolle <juha.vuolle@qt.io>
Date: Wed, 30 Apr 2025 09:54:35 +0300
Subject: [PATCH] Fix tst_dnslookup compilation when udpsocket is disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Guard the UDP socket includes and uses with feature flag.

Task-number: QTBUG-136101
Pick-to: 6.8
Change-Id: I1fe27244e6aa029407b07ebc06de137ec8b280af
Reviewed-by: Mate Barany <mate.barany@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 6816273f0ed620ef28b407eb24d53212ea08dd77)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../auto/network/kernel/qdnslookup/tst_qdnslookup.cpp  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
index eda494d60a5..01db1137fcb 100644
--- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
+++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
@@ -11,8 +11,10 @@
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QRandomGenerator>
 #include <QtNetwork/QHostAddress>
+#if QT_CONFIG(udpsocket)
 #include <QtNetwork/QNetworkDatagram>
 #include <QtNetwork/QUdpSocket>
+#endif
 
 #if QT_CONFIG(networkproxy)
 #  include <QtNetwork/QNetworkProxyFactory>
@@ -157,6 +159,7 @@ static QList<QHostAddress> globalPublicNameservers(QDnsLookup::Protocol proto)
     };
 
     auto udpSendAndReceive = [](const QHostAddress &addr, QByteArray &data) {
+#if QT_CONFIG(udpsocket)
         QUdpSocket socket;
         socket.connectToHost(addr, 53);
         if (socket.waitForConnected(1))
@@ -171,6 +174,9 @@ static QList<QHostAddress> globalPublicNameservers(QDnsLookup::Protocol proto)
 
         data = dgram.data();
         return QString();
+#else
+        return u"UDP socket support not compiled in"_s;
+#endif // QT_CONFIG(udpsocket)
     };
 
     auto tlsSendAndReceive = [](const QHostAddress &addr, QByteArray &data) {
@@ -701,6 +707,9 @@ void tst_QDnsLookup::lookupAbortRetry()
 
 void tst_QDnsLookup::setNameserverLoopback()
 {
+#if !QT_CONFIG(udpsocket)
+    QSKIP("UDP socket not enabled");
+#else
 #ifdef Q_OS_WIN
     // Windows doesn't like sending DNS requests to ports other than 53, so
     // let's try it first.
@@ -754,6 +763,7 @@ void tst_QDnsLookup::setNameserverLoopback()
     QVERIFY(!QTestEventLoop::instance().timeout());
     QCOMPARE(spy.size(), 1);
     QCOMPARE(lookup.error(), QDnsLookup::NotFoundError);
+#endif // QT_CONFIG(udpsocket)
 }
 
 template <QDnsLookup::Protocol Protocol>