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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: I4d74ad26046136ff2d38cfc1015b502009b2b344
This commit is contained in:
Eike Ziller
2015-10-07 10:54:16 +02:00
parent 022a81da7a e548635a24
commit 3286113ea8
4 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/ios/iosconfigurations.cpp
View File

@@ -300,11 +300,28 @@ void IosConfigurations::updateAutomaticKitList()
}
if (kitExists) {
kitAtt->blockNotification();
// TODO: this is just to fix up broken display names from before
QString baseDisplayName = tr("%1 %2").arg(p.name, qt->unexpandedDisplayName());
QString displayName = baseDisplayName;
for (int iVers = 1; iVers < 100; ++iVers) {
bool unique = true;
foreach (const Kit *k, existingKits) {
if (k == kitAtt)
continue;
if (k->displayName() == displayName) {
unique = false;
break;
}
}
if (unique) break;
displayName = baseDisplayName + QLatin1Char('-') + QString::number(iVers);
}
kitAtt->setUnexpandedDisplayName(displayName);
} else {
qCDebug(kitSetupLog) << "setting up new kit for " << p.name;
kitAtt = new Kit;
kitAtt->setAutoDetected(true);
QString baseDisplayName = tr("%1 %2").arg(p.name, qt->displayName());
QString baseDisplayName = tr("%1 %2").arg(p.name, qt->unexpandedDisplayName());
QString displayName = baseDisplayName;
for (int iVers = 1; iVers < 100; ++iVers) {
bool unique = true;