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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Change-Id: Ia6558fc2423fd9cd84ca2282bfa60d102dff682e
This commit is contained in:
Eike Ziller
2021-05-19 09:54:07 +02:00
parent c49a0af504 801dbdf932
commit f83be6debe
21 changed files with 164 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -279,14 +279,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