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

ProjectExplorer: Fix ProjectImporter::cleanupTemporaryToolchains()

Browse Source 
We must not call ToolchainKitAspect::setToolchain(() with a null
toolchain.
This seems to have been broken for a while.

Change-Id: I0865b2965de4636d9045db3d67487840583ae0db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2024-09-05 15:53:20 +02:00
parent f7a230a5b6
commit 7bf72248ab
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/projectimporter.cpp
View File

@@ -318,8 +318,10 @@ static Toolchain *toolChainFromVariant(const QVariant &v)
void ProjectImporter::cleanupTemporaryToolchains(Kit *k, const QVariantList &vl) void ProjectImporter::cleanupTemporaryToolchains(Kit *k, const QVariantList &vl)
{ {
ToolchainManager::deregisterToolchains(Utils::transform(vl, toolChainFromVariant)); const Toolchains toolchains = Utils::transform(vl, toolChainFromVariant);
ToolchainKitAspect::setToolchain(k, nullptr); for (Toolchain * const tc : toolchains)
ToolchainKitAspect::clearToolchain(k, tc->language());
ToolchainManager::deregisterToolchains(toolchains);
} }
void ProjectImporter::persistTemporaryToolchains(Kit *k, const QVariantList &vl) void ProjectImporter::persistTemporaryToolchains(Kit *k, const QVariantList &vl)