diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-07 10:54:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-10-07 10:54:25 +0200 |
| commit | 3286113ea8d99ed648247c13477a1beb5bc30a2c (patch) | |
| tree | d00143ed07a94ff9fc077e32246e523987c6bd78 /src/plugins/ios | |
| parent | 022a81da7ac13e9515ee5c96f9f23f421f4ffcbe (diff) | |
| parent | e548635a24b93d17ae7cc8fd8d0b6c4ac95ee1f6 (diff) | |
| download | qt-creator-3286113ea8d99ed648247c13477a1beb5bc30a2c.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: I4d74ad26046136ff2d38cfc1015b502009b2b344
Diffstat (limited to 'src/plugins/ios')
| -rw-r--r-- | src/plugins/ios/iosconfigurations.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 99334e64eb..01ecfb5713 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -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; |