diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2023-03-14 17:12:51 +0100 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2023-03-14 18:03:53 +0000 |
| commit | 60e03d480570123acf72c32a697f59bd8ed5d493 (patch) | |
| tree | 26a1367b79ee91704ea414fe65563645af606886 | |
| parent | f4d72ebd794e78abfd442f4249c4fa31335688b7 (diff) | |
CMakePM: Do not pass QTC_KIT_DEFAULT_CONFIG_HASH to configurev10.0.0-rc1
QTC_KIT_DEFAULT_CONFIG_HASH is used to match CMake presets kits and
should not pass to the CMake configuration.
Change-Id: I27caedf03f94c1e864f16d1f735e2edbabbfe871
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 127e572110..fb3a098e54 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -1177,6 +1177,12 @@ static void addCMakeConfigurePresetToInitialArguments(QStringList &initialArgume initialArguments.removeIf( [presetArgument](const QString &item) { return item == presetArgument; }); + // Remove the -DQTC_KIT_DEFAULT_CONFIG_HASH argument + const QString presetHashArgument + = CMakeConfigurationKitAspect::kitDefaultConfigHashItem(k).toArgument(); + initialArguments.removeIf( + [presetHashArgument](const QString &item) { return item == presetHashArgument; }); + PresetsDetails::ConfigurePreset configurePreset = Utils::findOrDefault(project->presetsData().configurePresets, [presetName](const PresetsDetails::ConfigurePreset &preset) { |