From 801dbdf9324a67462eb6756f4ea49b31ae2074bb Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 18 May 2021 14:32:26 +0200 Subject: [PATCH] Android/Qbs: Improve startup time At startup the Android plugin looks at the NDK(s) for tool chains, and the for matching tool chains already registered in Qt Creator. If it finds one, it doesn't register a new one, but simply force-marks the found one as auto-detected. (See AndroidToolChainFactory::autodetectToolChainsFromNdks) Unfortunately changing the auto-detected property of a tool chain triggers a full update down the line, which for example Qbs takes as a hint to re-create profiles. This simply doesn't make sense. Setting the auto-detection flag shouldn't result in these updates. Task-number: QTCREATORBUG-25463 Change-Id: I22a5f6fbe08124a08041bf871e683bdbda279c01 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/toolchain.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 69355e44130..2427a2d4dd2 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -280,14 +280,7 @@ void ToolChain::toolChainUpdated() void ToolChain::setDetection(ToolChain::Detection de) { - if (d->m_detection == de) - return; - if (d->m_detection == ToolChain::UninitializedDetection) { - d->m_detection = de; - } else { - d->m_detection = de; - toolChainUpdated(); - } + d->m_detection = de; } QString ToolChain::typeDisplayName() const