From 44cc45e0007c48a0d30722839b6a9394b320e87a Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 18 Jan 2022 17:18:49 +0100
Subject: [PATCH] ProjectExplorer: Make ToolchainDetector ctor arguments
 mandatory

Makes it easier to spot unintended use.

Change-Id: I651391aa474030351be7ff0b369bdfee896bec59
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/plugins/projectexplorer/msvctoolchain.cpp | 4 ++--
 src/plugins/projectexplorer/toolchain.h       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 322b54e02d8..bb1c8a4f2db 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -1938,7 +1938,7 @@ Toolchains MsvcToolChainFactory::autoDetect(const ToolchainDetector &detector) c
                 {MsvcToolChain::ia64, "ia64"},
             };
             for (const auto &platform : platforms) {
-                tmp.append(findOrCreateToolchains(detector.alreadyKnown,
+                tmp.append(findOrCreateToolchains(detector,
                                                   generateDisplayName(name,
                                                                       MsvcToolChain::WindowsSDK,
                                                                       platform.first),
@@ -1979,7 +1979,7 @@ Toolchains MsvcToolChainFactory::autoDetect(const ToolchainDetector &detector) c
                 = QFileInfo(vcVarsBatFor(i.vcVarsPath, platform, i.version)).isFile();
             if (hostSupportsPlatform(platform) && toolchainInstalled) {
                 results.append(
-                    findOrCreateToolchains(detector.alreadyKnown,
+                    findOrCreateToolchains(detector,
                                            generateDisplayName(i.vsName, MsvcToolChain::VS, platform),
                                            findAbiOfMsvc(MsvcToolChain::VS, platform, i.vsName),
                                            i.vcVarsAll,
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index b73ccb13ed1..1c4b1a09fb2 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -217,7 +217,7 @@ using Toolchains = QList<ToolChain *>;
 class PROJECTEXPLORER_EXPORT ToolchainDetector
 {
 public:
-    ToolchainDetector(const Toolchains &alreadyKnown = {}, const IDevice::ConstPtr &device = {});
+    ToolchainDetector(const Toolchains &alreadyKnown, const IDevice::ConstPtr &device);
 
     const Toolchains alreadyKnown;
     const IDevice::ConstPtr device;