From 8c029e98bf668725979424766c0bbbfc012448b3 Mon Sep 17 00:00:00 2001 From: Christoph Keller Date: Tue, 13 Mar 2018 18:27:58 +0100 Subject: Fix build of applications on iOS When QMAKE_TARGET_BUNDLE_PREFIX is set in the .pro file then this value should be used instead of the default value for PRODUCT_BUNDLE_IDENTIFIER. Therefore, PRODUCT_BUNDLE_IDENTIFIER should be set inside default_post.prf so that it can take the value of QMAKE_TARGET_BUNDLE_PREFIX after it may have been set. Task-number: QTBUG-66462 Change-Id: Iec1e2a43632efe6021b9d6bfdb78bd941326c456 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/mac/default_post.prf | 7 +++++++ mkspecs/features/mac/default_pre.prf | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 50a1ec6764..21d487f1f9 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -210,3 +210,10 @@ cache(QMAKE_XCODE_DEVELOPER_PATH, stash) cache(QMAKE_XCODE_VERSION, stash) QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() + +xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +isEmpty(xcode_product_bundle_identifier_setting.value): \ + xcode_product_bundle_identifier_setting.value = "com.yourcompany" +xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index f1a4ca77b2..e3534561a5 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -58,10 +58,3 @@ QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP xcode_copy_phase_strip_setting.value = NO QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting - -xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER -xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX -isEmpty(xcode_product_bundle_identifier_setting.value): \ - xcode_product_bundle_identifier_setting.value = "com.yourcompany" -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- cgit v1.2.3