Build: Drop qmake application bundle name #2477
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jamulus.pro sets `QMAKE_APPLICATION_BUNDLE_NAME.` (note the trailing dot). This sets the variable with exactly this name, but not the probably intended dot-less QMAKE_APPLICATION_BUNDLE_NAME. As this can't have worked in the past, it's obviously not necessary. So instead of fixing the assignment, the line is dropped altogether. The docs[1] suggest that QMAKE_APPLICATION_BUNDLE_NAME is used in the plist generation logic, but that the relevant place defaults to using TARGET, which we do set properly. This highlights that it should be ok to work without QMAKE_APPLICATION_BUNDLE_NAME. [1] https://doc.qt.io/qt-5/qmake-variable-reference.html
softins
approved these changes
Mar 9, 2022
Member
softins
left a comment
There was a problem hiding this comment.
So long as we set TARGET, that should be fine. It appears that QMAKE_APPLICATION_BUNDLE_NAME is only intended to override TARGET if desired. So there's no point in actually setting it from TARGET.
I found only these references in the qmake specs files:
resolve_target.prf:
app_bundle {
!isEmpty(QMAKE_APPLICATION_BUNDLE_NAME): \
app_target = $$QMAKE_APPLICATION_BUNDLE_NAME
else: \
app_target = $$TARGET
separate_debug_info.prf:
if(any_bundle:!build_pass)|if(!any_bundle:if(build_pass|isEmpty(BUILDS))) {
equals(TEMPLATE, lib):lib_bundle:!isEmpty(QMAKE_FRAMEWORK_BUNDLE_NAME): \
BUNDLEIDENTIFIER = $$replace(QMAKE_FRAMEWORK_BUNDLE_NAME, \\.framework$, )
else: equals(TEMPLATE, app):app_bundle:!isEmpty(QMAKE_APPLICATION_BUNDLE_NAME): \
BUNDLEIDENTIFIER = $$replace(QMAKE_APPLICATION_BUNDLE_NAME, \\.app$, )
else: \
BUNDLEIDENTIFIER = $${TARGET}
pljones
approved these changes
Mar 9, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Short description of changes
Jamulus.pro sets
QMAKE_APPLICATION_BUNDLE_NAME.(note the trailing dot). This sets the variable with exactly this name, but not the probably intended dot-lessQMAKE_APPLICATION_BUNDLE_NAME.As this can't have worked in the past, it's obviously not necessary. So instead of fixing the assignment, the line is dropped altogether.
The docs suggest that QMAKE_APPLICATION_BUNDLE_NAME is used in the plist generation logic, but that the relevant place defaults to using TARGET, which we do set properly. This highlights that it should be ok to work without QMAKE_APPLICATION_BUNDLE_NAME.
CHANGELOG: Build: Removed broken QMAKE_APPLICATION_BUNDLE_NAME. logic.
(I'll probably merge this Changelog line with other autobuild improvements)
Context: Fixes an issue?
Remove broken code.
Does this change need documentation? What needs to be documented and how?
No.
Status of this Pull Request
Ready on CI green.
What is missing until this pull request can be merged?
Reviews.
Checklist