feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Make ToolchainDetector ctor arguments mandatory

Browse Source 
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>
This commit is contained in:
hjk
2022-01-18 17:18:49 +01:00
parent d8e393953d
commit 44cc45e000
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -1938,7 +1938,7 @@ Toolchains MsvcToolChainFactory::autoDetect(const ToolchainDetector &detector) c
{MsvcToolChain::ia64, "ia64"}, {MsvcToolChain::ia64, "ia64"},
}; };
for (const auto &platform : platforms) { for (const auto &platform : platforms) {
tmp.append(findOrCreateToolchains(detector.alreadyKnown, tmp.append(findOrCreateToolchains(detector,
generateDisplayName(name, generateDisplayName(name,
MsvcToolChain::WindowsSDK, MsvcToolChain::WindowsSDK,
platform.first), platform.first),
@@ -1979,7 +1979,7 @@ Toolchains MsvcToolChainFactory::autoDetect(const ToolchainDetector &detector) c
= QFileInfo(vcVarsBatFor(i.vcVarsPath, platform, i.version)).isFile(); = QFileInfo(vcVarsBatFor(i.vcVarsPath, platform, i.version)).isFile();
if (hostSupportsPlatform(platform) && toolchainInstalled) { if (hostSupportsPlatform(platform) && toolchainInstalled) {
results.append( results.append(
findOrCreateToolchains(detector.alreadyKnown, findOrCreateToolchains(detector,
generateDisplayName(i.vsName, MsvcToolChain::VS, platform), generateDisplayName(i.vsName, MsvcToolChain::VS, platform),
findAbiOfMsvc(MsvcToolChain::VS, platform, i.vsName), findAbiOfMsvc(MsvcToolChain::VS, platform, i.vsName),
i.vcVarsAll, i.vcVarsAll,

2
src/plugins/projectexplorer/toolchain.h
View File

@@ -217,7 +217,7 @@ using Toolchains = QList<ToolChain *>;
class PROJECTEXPLORER_EXPORT ToolchainDetector class PROJECTEXPLORER_EXPORT ToolchainDetector
{ {
public: public:
ToolchainDetector(const Toolchains &alreadyKnown = {}, const IDevice::ConstPtr &device = {}); ToolchainDetector(const Toolchains &alreadyKnown, const IDevice::ConstPtr &device);
const Toolchains alreadyKnown; const Toolchains alreadyKnown;
const IDevice::ConstPtr device; const IDevice::ConstPtr device;