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

Project: Avoid unnecessary activeTargetChanged signal

Browse Source 
Make sure to create the active target first when reading a project
for the user data. This implicitly sets this target to the active one,
avoiding one spurious activeTargetChanged signal.

Change-Id: Iff9b19ed25bac9809ae75489ae159ffb66e71cb4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-26 18:34:38 +02:00
parent be3254c7c3
commit 1a5eaecd97
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -665,24 +665,33 @@ Project::RestoreResult Project::fromMap(const QVariantMap &map, QString *errorMe
if (!ok || active < 0 || active >= maxI)
active = 0;
if (active >= 0 && active < maxI)
createTargetFromMap(map, active); // sets activeTarget since it is the first target created!
for (int i = 0; i < maxI; ++i) {
const QString key(QString::fromLatin1(TARGET_KEY_PREFIX) + QString::number(i));
if (!map.contains(key))
continue;
QVariantMap targetMap = map.value(key).toMap();
Target *t = restoreTarget(targetMap);
if (!t)
if (i == active) // already covered!
continue;
addTarget(t);
if (i == active)
setActiveTarget(t);
createTargetFromMap(map, i);
}
return RestoreResult::Ok;
}
void Project::createTargetFromMap(const QVariantMap &map, int index)
{
const QString key = QString::fromLatin1(TARGET_KEY_PREFIX) + QString::number(index);
if (!map.contains(key))
return;
QVariantMap targetMap = map.value(key).toMap();
Target *t = restoreTarget(targetMap);
if (!t)
return;
addTarget(t);
}
EditorConfiguration *Project::editorConfiguration() const
{
return &d->m_editorConfiguration;