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

Merge remote-tracking branch 'origin/9.0' into 10.0

Browse Source 
Change-Id: I8d73198561f6ff7877d580681ca2a0018b7dc3b1
This commit is contained in:
Eike Ziller
2023-02-06 10:14:18 +01:00
parent 82d2f02c3f dd3f5d3a6a
commit d278135497
9 changed files with 72 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -1143,7 +1143,10 @@ void CMakeConfigurationKitAspect::setKitDefaultConfigHash(ProjectExplorer::Kit *
expanded.value = item.expandedValue(k).toUtf8();
return expanded;
});
const QByteArray kitHash = computeDefaultConfigHash(defaultConfigExpanded);
const CMakeTool *const tool = CMakeKitAspect::cmakeTool(k);
const QByteArray kitHash = computeDefaultConfigHash(defaultConfigExpanded,
tool ? tool->cmakeExecutable()
: FilePath());
CMakeConfig config = configuration(k);
config.append(CMakeConfigItem(QTC_KIT_DEFAULT_CONFIG_HASH, CMakeConfigItem::INTERNAL, kitHash));
@@ -1159,7 +1162,8 @@ CMakeConfigItem CMakeConfigurationKitAspect::kitDefaultConfigHashItem(const Proj
});
}
QByteArray CMakeConfigurationKitAspect::computeDefaultConfigHash(const CMakeConfig &config)
QByteArray CMakeConfigurationKitAspect::computeDefaultConfigHash(const CMakeConfig &config,
const FilePath &cmakeBinary)
{
const CMakeConfig defaultConfig = defaultConfiguration(nullptr);
const QByteArray configValues = std::accumulate(defaultConfig.begin(),
@@ -1169,7 +1173,11 @@ QByteArray CMakeConfigurationKitAspect::computeDefaultConfigHash(const CMakeConf
const CMakeConfigItem &item) {
return sum += config.valueOf(item.key);
});
return QCryptographicHash::hash(configValues, QCryptographicHash::Md5).toHex();
return QCryptographicHash::hash(cmakeBinary.caseSensitivity() == Qt::CaseInsensitive
? configValues.toLower()
: configValues,
QCryptographicHash::Md5)
.toHex();
}
QVariant CMakeConfigurationKitAspect::defaultValue(const Kit *k) const