diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-05-07 11:24:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-05-07 12:19:00 +0000 |
| commit | d1ab9cdcbe64e48dff04218307319b7f6e74d8a5 (patch) | |
| tree | 98c34e42ab7871187bd8d91da954abd7b4365e95 | |
| parent | e7d6ea6ad3b2aed9f7b4fd3b47d89dbf0c634c13 (diff) | |
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 <tobias.hunger@theqtcompany.com>
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index 4444fc98cb..91d2902dc3 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -46,6 +46,7 @@ #include <qtsupport/baseqtversion.h> #include <qtsupport/qtkitinformation.h> +#include <QCryptographicHash> #include <QVariantMap> #include <qbs.h> @@ -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); |