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

CMakePM: Do not force Xcode generator for iOS

Browse Source 
"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 b47a80c5ce

Fixes: QTCREATORBUG-30214
Change-Id: Idbdadcf24e87b861adf377975788e0146f7731cb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2024-01-19 15:08:32 +01:00
parent 0e4af4b880
commit 0197a2780a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -231,7 +231,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
stagingDir.setExpectedKind(PathChooser::Kind::Directory); stagingDir.setExpectedKind(PathChooser::Kind::Directory);
Kit *kit = buildConfiguration()->kit(); Kit *kit = buildConfiguration()->kit();
if (CMakeBuildConfiguration::isIos(kit)) { if (CMakeBuildConfiguration::isIos(kit) && CMakeGeneratorKitAspect::generator(kit) == "Xcode") {
useiOSAutomaticProvisioningUpdates.setDefaultValue(true); useiOSAutomaticProvisioningUpdates.setDefaultValue(true);
useiOSAutomaticProvisioningUpdates.setSettingsKey( useiOSAutomaticProvisioningUpdates.setSettingsKey(
IOS_AUTOMATIC_PROVISIONG_UPDATES_ARGUMENTS_KEY); IOS_AUTOMATIC_PROVISIONG_UPDATES_ARGUMENTS_KEY);

2
src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
View File

@@ -791,7 +791,7 @@ void CMakeGeneratorKitAspectFactory::fix(Kit *k)
dv.fromVariant(defaultValue(k)); dv.fromVariant(defaultValue(k));
setGeneratorInfo(k, dv); setGeneratorInfo(k, dv);
} else { } else {
const GeneratorInfo dv(isIos(k) ? QString("Xcode") : info.generator, const GeneratorInfo dv(info.generator,
it->supportsPlatform ? info.platform : QString(), it->supportsPlatform ? info.platform : QString(),
it->supportsToolset ? info.toolset : QString()); it->supportsToolset ? info.toolset : QString());
setGeneratorInfo(k, dv); setGeneratorInfo(k, dv);