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

ProjectExplorer: Emit activeBuildConfigurationChanged on project restore

Browse Source 
Change-Id: Id5f2d8b36d99df1ffc6e4e0d8a680b55e57c336e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-08-06 11:00:43 +02:00
parent 0dc97a51b5
commit 926338f509
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/project.cpp
View File

@@ -557,12 +557,20 @@ void Project::saveSettings()
Project::RestoreResult Project::restoreSettings(QString *errorMessage) Project::RestoreResult Project::restoreSettings(QString *errorMessage)
{ {
BuildConfiguration *oldBc = activeTarget() ? activeTarget()->activeBuildConfiguration()
: nullptr;
if (!d->m_accessor) if (!d->m_accessor)
d->m_accessor = std::make_unique<Internal::UserFileAccessor>(this); d->m_accessor = std::make_unique<Internal::UserFileAccessor>(this);
QVariantMap map(d->m_accessor->restoreSettings(Core::ICore::mainWindow())); QVariantMap map(d->m_accessor->restoreSettings(Core::ICore::mainWindow()));
RestoreResult result = fromMap(map, errorMessage); RestoreResult result = fromMap(map, errorMessage);
if (result == RestoreResult::Ok) if (result == RestoreResult::Ok)
emit settingsLoaded(); emit settingsLoaded();
BuildConfiguration *bc = activeTarget() ? activeTarget()->activeBuildConfiguration() : nullptr;
if (bc != oldBc)
emit activeBuildConfigurationChanged(bc);
return result; return result;
} }