1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: Fix non-Xcode asset catalog handling for iOS simulator

Browse Source 
If an iOS project was built with qmake using the Makefile generator
instead of the Xcode generator,
so -spec macx-ios-clang, and not -spec macx-xcode,

Asset catalog processing failed with an actool error like
 Unknown platform: "ios-simulator"

This is because we used the deployment identifier (which is meant for
creation of the -mios-simulator-version-min flag) to pass a value
to actool's -platform option, rather than the sdk name.

Introduce a new variable called platform_identifier, which will be set
to the currently processed macOS/iOS sdk name (e.g. macosx,
iphonesimulator, iphoneos).

Use it when processing asset catalogs using the Makefile generator.

Relates to 9daeb6fe9d35b10ed739ea0a0566533524ffd532
Amends 5574aa986b69277881fe5fc694d97514c668024f

Fixes: QTBUG-102053
Change-Id: Ic4ea3b9e11c21ae535d6544cbed3670f9db44e72
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit e38956e4f754ef8faa2ee4e76b787d71c773dcdb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2022-08-15 17:24:41 +02:00 committed by Qt Cherry-pick Bot
parent 4864251636
commit 101b2f055f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/mac/asset_catalogs.prf
View File

@ -68,7 +68,7 @@
$$asset_catalog_app_icon_arg \ $$asset_catalog_app_icon_arg \
$$asset_catalog_launch_image_arg \ $$asset_catalog_launch_image_arg \
--output-partial-info-plist $$shell_quote($$asset_catalog_compiler.target) \ --output-partial-info-plist $$shell_quote($$asset_catalog_compiler.target) \
--platform $${version_identifier} \ --platform $${platform_identifier} \
--minimum-deployment-target $${deployment_target} \ --minimum-deployment-target $${deployment_target} \
--compile $$shell_quote($$QMAKE_ASSET_CATALOGS_BUILD_PATH) --compile $$shell_quote($$QMAKE_ASSET_CATALOGS_BUILD_PATH)

4
mkspecs/features/mac/default_post.prf
View File

@ -208,9 +208,11 @@ macx-xcode {
contains(VALID_SIMULATOR_ARCHS, $$arch) { contains(VALID_SIMULATOR_ARCHS, $$arch) {
sdk = $$simulator.sdk sdk = $$simulator.sdk
version_identifier = $$simulator.deployment_identifier version_identifier = $$simulator.deployment_identifier
platform_identifier = $$simulator.sdk
} else { } else {
sdk = $$device.sdk sdk = $$device.sdk
version_identifier = $$device.deployment_identifier version_identifier = $$device.deployment_identifier
platform_identifier = $$device.sdk
} }
version_min_flags = \ version_min_flags = \
@ -237,9 +239,11 @@ macx-xcode {
} else { } else {
simulator { simulator {
version_identifier = $$simulator.deployment_identifier version_identifier = $$simulator.deployment_identifier
platform_identifier = $$simulator.sdk
sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk)
} else { } else {
version_identifier = $$device.deployment_identifier version_identifier = $$device.deployment_identifier
platform_identifier = $$device.sdk
sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk)
} }
version_min_flag = -m$${version_identifier}-version-min=$$deployment_target version_min_flag = -m$${version_identifier}-version-min=$$deployment_target