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

QmakeProjectImporter: Clean up temporarily created Qt versions

Browse Source 
Change-Id: I341091e667632cc38a6d6c5ead0f286dde750221
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-06-18 17:48:02 +02:00
parent 0dd1433015
commit 20d945aeb2
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,6 +240,20 @@ void QmakeProjectImporter::cleanupKit(ProjectExplorer::Kit *k)
QtSupport::QtVersionManager::removeVersion(version); QtSupport::QtVersionManager::removeVersion(version);
} }
void QmakeProjectImporter::makePermanent(ProjectExplorer::Kit *k)
{
int tempId = k->value(QT_IS_TEMPORARY, -1).toInt();
int qtId = QtSupport::QtKitInformation::qtVersionId(k);
if (tempId != qtId) {
QtSupport::BaseQtVersion *version = QtSupport::QtVersionManager::version(tempId);
if (version)
QtSupport::QtVersionManager::removeVersion(version);
}
k->removeKey(QT_IS_TEMPORARY);
ProjectImporter::makePermanent(k);
}
ProjectExplorer::Kit *QmakeProjectImporter::createTemporaryKit(QtSupport::BaseQtVersion *version, ProjectExplorer::Kit *QmakeProjectImporter::createTemporaryKit(QtSupport::BaseQtVersion *version,
bool temporaryVersion, bool temporaryVersion,
const Utils::FileName &parsedSpec) const Utils::FileName &parsedSpec)

2
src/plugins/qmakeprojectmanager/qmakeprojectimporter.h
View File

@@ -52,6 +52,8 @@ public:
void cleanupKit(ProjectExplorer::Kit *k); void cleanupKit(ProjectExplorer::Kit *k);
void makePermanent(ProjectExplorer::Kit *k);
private: private:
ProjectExplorer::Kit *createTemporaryKit(QtSupport::BaseQtVersion *version, ProjectExplorer::Kit *createTemporaryKit(QtSupport::BaseQtVersion *version,
bool temporaryVersion, bool temporaryVersion,