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

CMakePM: Don't remove QML debugging flag with the preset value

Browse Source 
If a CMake preset has the CMAKE_CXX_FLAGS_INIT parameter defined, it
would override the QML debugging flag set before.

This patchset makes sure that both are present.

Change-Id: I2012567af04c2fa0b0097331c05d96770dd86503
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2024-06-04 23:18:22 +02:00
parent ffc3c9b7f3
commit e04c727043
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -1349,6 +1349,14 @@ static void addCMakeConfigurePresetToInitialArguments(QStringList &initialArgume
if (argFilePath != presetFilePath) if (argFilePath != presetFilePath)
arg = presetItem.toArgument(); arg = presetItem.toArgument();
} else if (argItem.key == "CMAKE_CXX_FLAGS_INIT") {
// Append the preset value with at the initial parameters value (e.g. QML Debugging)
if (argItem.expandedValue(k) != QString::fromUtf8(presetItem.value)) {
argItem.value.append(" ");
argItem.value.append(presetItem.value);
arg = argItem.toArgument();
}
} else if (argItem.expandedValue(k) != QString::fromUtf8(presetItem.value)) { } else if (argItem.expandedValue(k) != QString::fromUtf8(presetItem.value)) {
arg = presetItem.toArgument(); arg = presetItem.toArgument();
} }