GenericProjectManager: Make sure we parse for the right configuration

Fixes: QTCREATORBUG-25592
Change-Id: I5f03fa799f693c16d842cf8279d664194684884d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2021-04-19 14:54:29 +02:00
parent b1758b1eb2
commit 743ef263c9

View File

@@ -251,7 +251,14 @@ GenericBuildSystem::GenericBuildSystem(Target *target)
connect(&m_deployFileWatcher, &FileSystemWatcher::fileChanged, connect(&m_deployFileWatcher, &FileSystemWatcher::fileChanged,
this, &GenericBuildSystem::updateDeploymentData); this, &GenericBuildSystem::updateDeploymentData);
connect(target, &Target::activeBuildConfigurationChanged, this, [this] { refresh(Everything); }); connect(target, &Target::activeBuildConfigurationChanged, this, [this, target] {
if (target == project()->activeTarget())
refresh(Everything);
});
connect(project(), &Project::activeTargetChanged, this, [this, target] {
if (target == project()->activeTarget())
refresh(Everything);
});
} }
GenericBuildSystem::~GenericBuildSystem() GenericBuildSystem::~GenericBuildSystem()
@@ -553,6 +560,8 @@ void GenericBuildSystem::refreshCppCodeModel()
{ {
if (!m_cppCodeModelUpdater) if (!m_cppCodeModelUpdater)
return; return;
if (target() != project()->activeTarget())
return;
QtSupport::CppKitInfo kitInfo(kit()); QtSupport::CppKitInfo kitInfo(kit());
QTC_ASSERT(kitInfo.isValid(), return); QTC_ASSERT(kitInfo.isValid(), return);