From bcef9dfbeea1debb3c777136ebe3bce146e94df7 Mon Sep 17 00:00:00 2001
From: unknown <1310440+hemirt@users.noreply.github.com>
Date: Mon, 8 Apr 2024 00:30:34 +0200
Subject: [PATCH 1/4] Skip conan and vcpkg autosetup when using QtCreator

---
 QtCreatorPackageManager.cmake | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 QtCreatorPackageManager.cmake

diff --git a/QtCreatorPackageManager.cmake b/QtCreatorPackageManager.cmake
new file mode 100644
index 00000000000..7a48e29e6c4
--- /dev/null
+++ b/QtCreatorPackageManager.cmake
@@ -0,0 +1,7 @@
+if (NOT QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP)
+    message(STATUS "Skipping Qt Creator automatic package manager (skipping Conan and VCPKG) - check QtCreatorPackageManager.cmake for more details")
+endif()
+
+set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON)
+set(QT_CREATOR_SKIP_CONAN_SETUP ON)
+set(QT_CREATOR_SKIP_VCPKG_SETUP ON)
\ No newline at end of file

From 471e4868b481fecd1059385bb47e13e4f5e78cae Mon Sep 17 00:00:00 2001
From: hemirt <1310440+hemirt@users.noreply.github.com>
Date: Mon, 20 May 2024 22:35:25 +0200
Subject: [PATCH 2/4] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fb4f7e5781..7e90efc659c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Dev: Make printing of strings in tests easier. (#5379)
 - Dev: Refactor and document `Scrollbar`. (#5334, #5393)
 - Dev: Reduced the amount of scale events. (#5404, #5406)
+- Dev: Skip conan and vcpkg autosetup when using QtCreator. (#5305)
 
 ## 2.5.1
 

From 08ef76a3a5359f7e835f000bb9ebb11216bbc7af Mon Sep 17 00:00:00 2001
From: hemirt <1310440+hemirt@users.noreply.github.com>
Date: Thu, 6 Jun 2024 07:49:16 +0200
Subject: [PATCH 3/4] Skip VCPKG auto-setup, keep Conan auto-setup

---
 QtCreatorPackageManager.cmake | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/QtCreatorPackageManager.cmake b/QtCreatorPackageManager.cmake
index 7a48e29e6c4..f26a970c81e 100644
--- a/QtCreatorPackageManager.cmake
+++ b/QtCreatorPackageManager.cmake
@@ -1,7 +1,5 @@
-if (NOT QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP)
-    message(STATUS "Skipping Qt Creator automatic package manager (skipping Conan and VCPKG) - check QtCreatorPackageManager.cmake for more details")
-endif()
+# https://www.qt.io/blog/qt-creator-cmake-package-manager-auto-setup
 
-set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON)
-set(QT_CREATOR_SKIP_CONAN_SETUP ON)
-set(QT_CREATOR_SKIP_VCPKG_SETUP ON)
\ No newline at end of file
+# set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON) # skip both conan and vcpkg auto-setups
+# set(QT_CREATOR_SKIP_CONAN_SETUP ON) # skip conan auto-setup
+set(QT_CREATOR_SKIP_VCPKG_SETUP ON) # skip vcpkg auto-setup

From 07dd2cb252809cfc81930829b66ad9e44d6fb80d Mon Sep 17 00:00:00 2001
From: hemirt <1310440+hemirt@users.noreply.github.com>
Date: Thu, 6 Jun 2024 07:50:48 +0200
Subject: [PATCH 4/4] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b85713a2710..a652cdca451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@
 - Dev: Removed unused timegate settings. (#5361)
 - Dev: All Lua globals now show in the `c2` global in the LuaLS metadata. (#5385)
 - Dev: Images are now loaded in worker threads. (#5431)
-- Dev: Skip conan and vcpkg autosetup when using QtCreator. (#5305)
+- Dev: Qt Creator now auto-configures Conan when loading the project and skips vcpkg. (#5305)
 
 ## 2.5.1