From 0197a2780a3bb24bc258f9b74709de85b6a9c937 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Fri, 19 Jan 2024 15:08:32 +0100 Subject: [PATCH] CMakePM: Do not force Xcode generator for iOS "Xcode" will be set as default generator for iOS kits, but if the user imports a iOS build from command line we shouldn't reset that generator to "Xcode". Amends b47a80c5ce2a12c94f02fd3eef97ed5d791a98f9 Fixes: QTCREATORBUG-30214 Change-Id: Idbdadcf24e87b861adf377975788e0146f7731cb Reviewed-by: Alexandru Croitor Reviewed-by: Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakekitaspect.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index ace64582f22..b874502ad07 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -231,7 +231,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) : stagingDir.setExpectedKind(PathChooser::Kind::Directory); Kit *kit = buildConfiguration()->kit(); - if (CMakeBuildConfiguration::isIos(kit)) { + if (CMakeBuildConfiguration::isIos(kit) && CMakeGeneratorKitAspect::generator(kit) == "Xcode") { useiOSAutomaticProvisioningUpdates.setDefaultValue(true); useiOSAutomaticProvisioningUpdates.setSettingsKey( IOS_AUTOMATIC_PROVISIONG_UPDATES_ARGUMENTS_KEY); diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp index 6c112f01d5c..acf6451e8dd 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp @@ -791,7 +791,7 @@ void CMakeGeneratorKitAspectFactory::fix(Kit *k) dv.fromVariant(defaultValue(k)); setGeneratorInfo(k, dv); } else { - const GeneratorInfo dv(isIos(k) ? QString("Xcode") : info.generator, + const GeneratorInfo dv(info.generator, it->supportsPlatform ? info.platform : QString(), it->supportsToolset ? info.toolset : QString()); setGeneratorInfo(k, dv);