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

Android: Fix file system name for Android kits not being sticky

Browse Source 
Task-number: QTCREATORBUG-17567
Change-Id: I48a3b2f8486c63676bb18ff025ed6412f48e3873
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Vikas Pachdha
2017-01-12 13:26:24 +01:00
parent 1ac1c61bb7
commit 509657b6a1
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/android/androidconfigurations.cpp
View File

@@ -1289,7 +1289,6 @@ void AndroidConfigurations::updateAutomaticKitList()
}
// register new kits
QList<Kit *> newKits;
const QList<ToolChain *> tmp = Utils::filtered(ToolChainManager::toolChains(), [](ToolChain *tc) {
return tc->isAutoDetected()
&& tc->isValid()
@@ -1316,6 +1315,13 @@ void AndroidConfigurations::updateAutomaticKitList()
QtSupport::QtKitInformation::setQtVersion(newKit, qt);
DeviceKitInformation::setDevice(newKit, device);
auto findExistingKit = [newKit](const Kit *k) { return matchKits(newKit, k); };
Kit *existingKit = Utils::findOrDefault(existingKits, findExistingKit);
if (existingKit) {
KitManager::deleteKit(newKit);
newKit = existingKit;
}
Debugger::DebuggerItem debugger;
debugger.setCommand(tc->suggestedDebugger());
debugger.setEngineType(Debugger::GdbEngineType);
@@ -1332,19 +1338,8 @@ void AndroidConfigurations::updateAutomaticKitList()
.arg(static_cast<const AndroidQtVersion *>(qt)->targetArch())
.arg(tc->ndkToolChainVersion())
.arg(qt->qtVersionString()));
newKits << newKit;
}
}
QSet<const Kit *> rediscoveredExistingKits;
for (Kit *newKit : newKits) {
Kit *existingKit = Utils::findOrDefault(existingKits, [newKit](const Kit *k) { return matchKits(newKit, k); });
if (existingKit) {
existingKit->copyFrom(newKit);
KitManager::deleteKit(newKit);
rediscoveredExistingKits.insert(existingKit);
} else {
KitManager::registerKit(newKit);
if (!existingKit)
KitManager::registerKit(newKit);
}
}
}