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

CMake: Pass CMakeBuildConfig to the settings widget

Browse Source 
... instead of the build system. Less indirections overall.

Change-Id: I59b2fd4508b24a72357426439cac7fbd563e05bf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2023-07-07 16:27:46 +02:00
parent b9cf021b8e
commit dbdd6a0701
5 changed files with 99 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -1572,7 +1572,8 @@ void CMakeBuildSystem::updateQmlJSCodeModel(const QStringList &extraHeaderPaths,
void CMakeBuildSystem::updateInitialCMakeExpandableVars()
{
const CMakeConfig &cm = configurationFromCMake();
const CMakeConfig &initialConfig = initialCMakeConfiguration();
const CMakeConfig &initialConfig =
cmakeBuildConfiguration()->initialCMakeArguments.cmakeConfiguration();
CMakeConfig config;
@@ -1733,7 +1734,8 @@ void CMakeBuildSystem::runGenerator(Id id)
QList<CMakeConfigItem> configItems = Utils::filtered(m_configurationChanges.toList(),
itemFilter);
const QList<CMakeConfigItem> initialConfigItems
= Utils::filtered(initialCMakeConfiguration().toList(), itemFilter);
= Utils::filtered(cmakeBuildConfiguration()->initialCMakeArguments.cmakeConfiguration().toList(),
itemFilter);
for (const CMakeConfigItem &item : std::as_const(initialConfigItems)) {
if (!Utils::contains(configItems, [&item](const CMakeConfigItem &existingItem) {
return existingItem.key == item.key;