From 70fc6b4581f9df59cf05c158e60d0343b69c2d57 Mon Sep 17 00:00:00 2001
From: Amir Masoud Abdol <amir.abdol@qt.io>
Date: Tue, 11 Jul 2023 14:58:50 +0200
Subject: [PATCH] Disable vcpkg detection/integration by default

We should not automatically enable vcpkg as soon as we find it on the
system. With this change, we disable the automatic
detection/integration.

[ChangeLog][configure] Vcpkg detection/integration is now disabled by
default, and it can be enabled by either passing `-vcpkg` to the
configure script, or by passing `-DQT_USE_VCPKG=ON` to cmake.

Change-Id: I4f098db670f11373064c071f1c3204e2e183d3db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 cmake/QtAutoDetect.cmake         | 2 +-
 cmake/configure-cmake-mapping.md | 2 +-
 config_help.txt                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake
index 012b3bbb745..bae271eeabb 100644
--- a/cmake/QtAutoDetect.cmake
+++ b/cmake/QtAutoDetect.cmake
@@ -9,7 +9,7 @@
 # done when initially configuring qtbase.
 
 # This needs to be here because QtAutoDetect loads before any other modules
-option(QT_USE_VCPKG "Enable the use of vcpkg" ON)
+option(QT_USE_VCPKG "Enable the use of vcpkg" OFF)
 
 function(qt_internal_ensure_static_qt_config)
     if(NOT DEFINED BUILD_SHARED_LIBS)
diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md
index b8eb8ddbfa5..0ce347b5f50 100644
--- a/cmake/configure-cmake-mapping.md
+++ b/cmake/configure-cmake-mapping.md
@@ -76,7 +76,7 @@ The following table describes the mapping of configure options to CMake argument
 | -unity-build-batch-size <int>         | -DQT_UNITY_BUILD_BATCH_SIZE=<int>                 |                                                                 |
 | -warnings-are-errors                  | -DWARNINGS_ARE_ERRORS=ON                          |                                                                 |
 | -no-pkg-config                        | -DFEATURE_pkg_config=OFF                          |                                                                 |
-| -no-vcpkg                             | -DQT_USE_VCPKG=OFF                                |                                                                 |
+| -vcpkg                                | -DQT_USE_VCPKG=ON                                 |                                                                 |
 | -D <string>                           | -DQT_EXTRA_DEFINES=<string1>;<string2>            |                                                                 |
 | -I <string>                           | -DQT_EXTRA_INCLUDEPATHS=<string1>;<string2>       |                                                                 |
 | -L <string>                           | -DQT_EXTRA_LIBDIRS=<string1>;<string2>            |                                                                 |
diff --git a/config_help.txt b/config_help.txt
index 6b54608a96c..9c9f8f7c622 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -162,7 +162,7 @@ Build environment:
 
   -pkg-config .......... Use pkg-config [auto] (Unix only)
 
-  -vcpkg ............... Use vcpkg [yes]
+  -vcpkg ............... Use vcpkg [no]
 
   -D <string> .......... Pass additional preprocessor define
   -I <string> .......... Pass additional include path