Darwin: fix ARM64 build and runtime compatibility issues#747
Open
moreaki wants to merge 1 commit into
Open
Conversation
|
Thank you for your pull request and welcome to our community! To contribute, please sign the Oracle Contributor Agreement (OCA).
To sign the OCA, please create an Oracle account and sign the OCA in Oracle's Contributor Agreement Application. When signing the OCA, please provide your GitHub username. After signing the OCA and getting an OCA approval from Oracle, this PR will be automatically updated. If you are an Oracle employee, please make sure that you are a member of the main Oracle GitHub organization, and your membership in this organization is public. |
696583a to
58be8b4
Compare
Signed-off-by: Roberto Nibali <rnibali@gmail.com>
58be8b4 to
81e2f01
Compare
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
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.
Summary
Add the minimal Darwin/Qt build compatibility fixes needed for the macOS/Arm test tree.
The changes cover:
include/c++fallback when probingiostreamon Darwin;--with-qt-pathas a normal Qt framework root instead of VirtualBox's privatelibQt6CoreVBoxtool package;-Fpaths from the detectedQtCore.framework;QChar, matching Qt 6's stricter overload set;Why
These are the smallest supporting fixes needed to keep the external macOS/Arm build usable for the Windows-on-Arm HiDPI and graphics-throughput work tracked in #742.
Compatibility note
The Qt path change is Darwin-only. Non-Darwin builds keep the existing tool-package path. Darwin builds without an explicit custom Qt root also keep the existing tool lookup. The custom-root path now only changes behavior when
--with-qt-pathpoints at a framework-based Qt installation.The
iostreamprobe change is also Darwin-only and only rejects Homebrew'sinclude/c++fallback for that standard C++ header.Validation
origin/main.git diff --checkpasses.python3 -m py_compile configure.pypasses.QChar(kShiftUnicode)is rejected whileQChar(static_cast<ushort>(kShiftUnicode))compiles.-F /opt/homebrew/opt/qt/Frameworkssyntax probe confirms<QtCore/QtGlobal>is usable through the framework path.--only-qt --disable-kbuild --disable-xcode --with-qt-path=/opt/homebrew/opt/qtreaches the Darwin framework path and reportsUsing framework at '/opt/homebrew/opt/qt/Frameworks/QtCore.framework'.Refs #742.