MacOS Qt5 overlay clean up #45
Merged
Conversation
This file contains 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
daschuer
force-pushed
the
qt5_overlay_clean_up
branch
from
05a6f4e to
3881cb4
Compare
Swiftb0y
reviewed
Jun 16, 2022
overlay/osx/qt5-base/portfile.cmake
Outdated
Comment on lines
176
to
181
| if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64") | ||
| string(REPLACE | ||
| "QMAKE_APPLE_DEVICE_ARCHS = x86_64" | ||
| "QMAKE_APPLE_DEVICE_ARCHS = arm64" | ||
| _tmp_contents ${_tmp_contents}) | ||
| endif() |
There was a problem hiding this comment.
can you explain this? Is this a change from us or a patch from Qt5.15?
There was a problem hiding this comment.
Ups, this slips in from the M1 arm port.
I must have messed up the rebase.
I will rebase this again to remove that change.
daschuer
force-pushed
the
qt5_overlay_clean_up
branch
from
3881cb4 to
8da1a73
Compare
|
Done. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a set of patches that improves our Qt5.12 backport for MacOs