From d1ab9cdcbe64e48dff04218307319b7f6e74d8a5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 7 May 2015 11:24:11 +0200 Subject: [PATCH] QbsProjectManager: Fix deriving qbs profile names from kit attributes. Turns out that using Id::uniqueIdentifier() is not deterministic across invocations of Creator... Change-Id: I8b78a5b36c2cd61e4b9c5d8cc8eb2c6083282c01 Reviewed-by: Tobias Hunger --- src/plugins/qbsprojectmanager/qbsprojectmanager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index 4444fc98cbb..91d2902dc3a 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -46,6 +46,7 @@ #include #include +#include #include #include @@ -194,7 +195,8 @@ void QbsManager::addQtProfileFromKit(const QString &profileName, const ProjectEx void QbsManager::addProfileFromKit(const ProjectExplorer::Kit *k) { const QString name = QString::fromLatin1("qtc_%1_%2").arg(k->fileSystemFriendlyName().left(8), - QString::number(k->id().uniqueIdentifier(), 16)); + QString::fromLatin1(QCryptographicHash::hash(k->id().name(), + QCryptographicHash::Sha1).toHex().left(8))); qbs::Profile(name, settings()).removeProfile(); setProfileForKit(name, k); addQtProfileFromKit(name, k);