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

ProjectExplorer: Use Guard in favor of setIsUpdating

Browse Source 
Change-Id: I4f8448205fe0f90d0b8554f0911e66aa74cbe9b5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-24 14:56:40 +02:00
parent 34c8a5d592
commit b8c83c45ac
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -124,9 +124,9 @@ QList<BuildInfo *> QmakeProjectImporter::import(const FileName &importPath, bool
if (!version)
continue;
bool oldIsUpdating = setIsUpdating(true);
UpdateGuard guard(*this);
QtVersionManager::addVersion(version);
setIsUpdating(oldIsUpdating);
temporaryVersion = true;
qCDebug(logs) << " created new qt version";
}
@@ -314,7 +314,8 @@ void QmakeProjectImporter::makePermanent(Kit *k)
{
if (!isTemporaryKit(k))
return;
setIsUpdating(true);
UpdateGuard guard(*this);
int tempId = k->value(QT_IS_TEMPORARY, -1).toInt();
int qtId = QtKitInformation::qtVersionId(k);
if (tempId != qtId) {
@@ -329,7 +330,6 @@ void QmakeProjectImporter::makePermanent(Kit *k)
foreach (Kit *kit, KitManager::kits())
if (kit->value(QT_IS_TEMPORARY, -1).toInt() == tempId)
kit->removeKeySilently(QT_IS_TEMPORARY);
setIsUpdating(false);
ProjectImporter::makePermanent(k);
}
@@ -356,9 +356,9 @@ Kit *QmakeProjectImporter::createTemporaryKit(BaseQtVersion *version,
{
Q_UNUSED(osType); // TODO use this to select the right toolchain?
Kit *k = new Kit;
bool oldIsUpdating = setIsUpdating(true);
UpdateGuard guard(*this);
{
KitGuard guard(k);
KitGuard kitGuard(k);
QtKitInformation::setQtVersion(k, version);
ToolChainKitInformation::setToolChain(k, preferredToolChain(version, parsedSpec, archConfig));
@@ -379,7 +379,6 @@ Kit *QmakeProjectImporter::createTemporaryKit(BaseQtVersion *version,
} // ~KitGuard, sending kitUpdated
KitManager::registerKit(k); // potentially adds kits to other targetsetuppages
setIsUpdating(oldIsUpdating);
return k;
}