From fb9f1dcb38e37a4c9af4ff5baae32345bb81e30b Mon Sep 17 00:00:00 2001
From: Sebastian Goth <mail@sgoth.de>
Date: Thu, 1 Aug 2024 19:10:00 +0200
Subject: [PATCH] [qtbase] fix windows with dnslookup feature (#40189)

---
 ports/qtbase/portfile.cmake | 5 ++++-
 ports/qtbase/vcpkg.json     | 2 +-
 versions/baseline.json      | 2 +-
 versions/q-/qtbase.json     | 5 +++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index 5cf813aed2..81dd861e77 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -138,7 +138,6 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL
     "brotli"              FEATURE_brotli
     "securetransport"     FEATURE_securetransport
     "dnslookup"           FEATURE_dnslookup
-    "dnslookup"           FEATURE_libresolv
     #"brotli"              CMAKE_REQUIRE_FIND_PACKAGE_WrapBrotli
     #"openssl"             CMAKE_REQUIRE_FIND_PACKAGE_WrapOpenSSL
  INVERTED_FEATURES
@@ -153,6 +152,10 @@ else()
     list(APPEND FEATURE_NET_OPTIONS -DINPUT_openssl=no)
 endif()
 
+if ("dnslookup" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND FEATURE_NET_OPTIONS -DFEATURE_libresolv:BOOL=ON)
+endif()
+
 list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON)
 list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON)
 
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 0617892c93..ac313bfc29 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.7.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Base (Core, Gui, Widgets, Network, ...)",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 2d4cf34a85..cd92d621a6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7414,7 +7414,7 @@
     },
     "qtbase": {
       "baseline": "6.7.2",
-      "port-version": 1
+      "port-version": 2
     },
     "qtcharts": {
       "baseline": "6.7.2",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 0913d21c0d..f5a9dc6d2f 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4ab85d9411b4c85c89976e768f158dd0631b442d",
+      "version": "6.7.2",
+      "port-version": 2
+    },
     {
       "git-tree": "b8c493a18ed293e1418f464515c9f9ddf3dc1bfe",
       "version": "6.7.2",