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

ToolChain: Fix id handling

Browse Source 
Change-Id: Ie005436f999b98f211872970be3b24965190b1a9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-02-21 12:03:14 +01:00
parent 503c6e2684
commit 02669ffd7d
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -86,13 +86,8 @@ public:
static QString createId(const QString &id) static QString createId(const QString &id)
{ {
QString newId = id; QString newId = id.left(id.indexOf(':'));
newId.append(QLatin1Char(':') + QUuid::createUuid().toString());
QUuid uuid(id.mid(id.indexOf(":") + 1));
if (uuid.isNull()) {
newId = id.left(id.indexOf(':'));
newId.append(QLatin1Char(':') + QUuid::createUuid().toString());
}
return newId; return newId;
} }
@@ -117,7 +112,7 @@ ToolChain::ToolChain(const QString &id, bool autodetect) :
{ } { }
ToolChain::ToolChain(const ToolChain &other) : ToolChain::ToolChain(const ToolChain &other) :
d(new Internal::ToolChainPrivate(other.id(), false)) d(new Internal::ToolChainPrivate(other.d->m_id, false))
{ {
// leave the autodetection bit at false. // leave the autodetection bit at false.
d->m_displayName = QCoreApplication::translate("ProjectExplorer::ToolChain", "Clone of %1") d->m_displayName = QCoreApplication::translate("ProjectExplorer::ToolChain", "Clone of %1")
@@ -244,7 +239,7 @@ bool ToolChain::fromMap(const QVariantMap &data)
{ {
d->m_displayName = data.value(QLatin1String(DISPLAY_NAME_KEY)).toString(); d->m_displayName = data.value(QLatin1String(DISPLAY_NAME_KEY)).toString();
// make sure we have new style ids: // make sure we have new style ids:
d->m_id = Internal::ToolChainPrivate::createId(data.value(QLatin1String(ID_KEY)).toString()); d->m_id = data.value(QLatin1String(ID_KEY)).toString();
d->m_autodetect = data.value(QLatin1String(AUTODETECT_KEY), false).toBool(); d->m_autodetect = data.value(QLatin1String(AUTODETECT_KEY), false).toBool();
d->m_mkspecList = mkspecListFromString(data.value(QLatin1String(MKSPEC_KEY)).toString()); d->m_mkspecList = mkspecListFromString(data.value(QLatin1String(MKSPEC_KEY)).toString());