diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-20 14:27:25 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-24 19:24:52 +0000 |
commit | aaa79cf73512a16724f084450025d223154b9f9e (patch) | |
tree | e15cabd9261aff297e6c50a6158cb7cc97a787ef | |
parent | dfb1f8d29351094bcf7d1bab91c69c93de890b10 (diff) |
CMake: Fix automatic iOS bundle id extraction
If no Xcode preferences file was found,
_qt_internal_get_ios_bundle_identifier_prefix accidentally assigned
the error output of running PlistBuddy to the bundle id property.
That resulted in a bundle id called
'${team_id}.Doesn't Exist, Will Create: /Users/qt/Library/Preferences/com.apple.dt.Xcode.plist\n.app'
Check that the error variable is empty before assigning.
Amends 4d838dae5a821e9e5f013ba1d5a494ece1b5180e
Task-number: QTBUG-95838
Change-Id: I3a7241528590ae3e9986cfa1f3e91ac983ef54f6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 5a437d2590765a80236efad82e79654ebb3b4469)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index dcc71a57ba..3615b2ebae 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -661,7 +661,7 @@ function(_qt_internal_get_ios_bundle_identifier_prefix out_var) message(DEBUG "Failed to extract the default bundle indentifier prefix.") endif() - if(prefix) + if(prefix AND NOT prefix_error) set_property(GLOBAL PROPERTY _qt_internal_ios_bundle_identifier_prefix "${prefix}") set("${out_var}" "${prefix}" PARENT_SCOPE) endif() |