aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qbsprojectmanager
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-11-24 17:55:50 +0100
committerhjk <hjk@qt.io>2023-11-27 13:35:28 +0000
commit3bbda8f9daf2d18fe6f973c7a7854ff81ffbdb85 (patch)
tree6a662cd00c0511e2b35905fd3631e571530fc200 /src/plugins/qbsprojectmanager
parentba249a35141892168f16fd3c6e4613f7b0f67131 (diff)
ProjectExplorer: Rename Tool{C,c}hainKitAspect
Change-Id: I74460b6402ab00f972c208023f03fac617982a11 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'src/plugins/qbsprojectmanager')
-rw-r--r--src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp4
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectimporter.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 658e6650c19..97b17346552 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -238,8 +238,8 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
if (!sysroot.isEmpty())
data.insert(QLatin1String(QBS_SYSROOT), sysroot);
- Toolchain *tcC = ToolChainKitAspect::cToolChain(k);
- Toolchain *tcCxx = ToolChainKitAspect::cxxToolChain(k);
+ Toolchain *tcC = ToolchainKitAspect::cToolChain(k);
+ Toolchain *tcCxx = ToolchainKitAspect::cxxToolChain(k);
if (!tcC && !tcCxx)
return data;
diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
index 0d5afda8f36..a8612d5e71e 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
@@ -141,12 +141,12 @@ bool QbsProjectImporter::matchKit(void *directoryData, const Kit *k) const
const auto * const bgData = static_cast<BuildGraphData *>(directoryData);
qCDebug(qbsPmLog) << "matching kit" << k->displayName() << "against imported build"
<< bgData->bgFilePath.toUserOutput();
- if (ToolChainKitAspect::toolChains(k).isEmpty() && bgData->cCompilerPath.isEmpty()
+ if (ToolchainKitAspect::toolChains(k).isEmpty() && bgData->cCompilerPath.isEmpty()
&& bgData->cxxCompilerPath.isEmpty()) {
return true;
}
- const Toolchain * const cToolchain = ToolChainKitAspect::cToolChain(k);
- const Toolchain * const cxxToolchain = ToolChainKitAspect::cxxToolChain(k);
+ const Toolchain * const cToolchain = ToolchainKitAspect::cToolChain(k);
+ const Toolchain * const cxxToolchain = ToolchainKitAspect::cxxToolChain(k);
if (!bgData->cCompilerPath.isEmpty()) {
if (!cToolchain)
return false;
@@ -190,7 +190,7 @@ Kit *QbsProjectImporter::createKit(void *directoryData) const
tcData << findOrCreateToolChains({bgData->cCompilerPath, PEConstants::C_LANGUAGE_ID});
for (const ToolChainData &tc : std::as_const(tcData)) {
if (!tc.tcs.isEmpty())
- ToolChainKitAspect::setToolChain(k, tc.tcs.first());
+ ToolchainKitAspect::setToolChain(k, tc.tcs.first());
}
SysRootKitAspect::setSysRoot(k, bgData->sysroot);
});