Upgrade iOS Build to Qt6 #3445
Merged
Upgrade iOS Build to Qt6 #3445
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
ann0see
force-pushed
the
iOS/upgradeiOSBuild
branch
from
3bb56b5 to
efdf705
Compare
ann0see
commented
Dec 23, 2024
Comment on lines
+48
to
+56
| # We may need to create the Qt installation directory and chown it to the runner user to fix permissions | ||
| sudo mkdir -p "${QT_DIR}" | ||
| sudo chown "$(whoami)" "${QT_DIR}" | ||
| # Create and enter virtual environment | ||
| python3 -m venv venv | ||
| # Must hide directory as it just gets created during execution of the previous command and cannot be found by shellcheck | ||
| # shellcheck source=/dev/null | ||
| source venv/bin/activate | ||
| pip install "aqtinstall==${AQTINSTALL_VERSION}" |
There was a problem hiding this comment.
Changed to be in line with macOS
ann0see
commented
Dec 23, 2024
| @@ -59,13 +67,12 @@ setup() { | |||
| # Starting with Qt6, ios' qtbase install does no longer include a real qmake binary. | |||
| # Instead, it is a script which invokes the mac desktop qmake. | |||
| # As of aqtinstall 2.1.0 / 04/2022, desktop qtbase has to be installed manually: | |||
| python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop "${QT_VERSION}" --archives qtbase | |||
| python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop "${QT_VERSION}" --archives qtbase qttools | |||
There was a problem hiding this comment.
Necessary to have lrelease in the correct spot. Otherwise the build fails.
This still has some UI issues. However, upgrading is needed as the CI no longer supports older macOS versions
ann0see
force-pushed
the
iOS/upgradeiOSBuild
branch
from
efdf705 to
93e89de
Compare
|
Tested, and it works as expected (with the known UI bugs) |
pljones
reviewed
Dec 24, 2024
| # Build failed with CodeQL enabled when last tested 03/2022 (#2490). | ||
| # There are no hints that iOS is supposed to be supported by CodeQL. | ||
| # Therefore, disable it: | ||
| run_codeql: false | ||
| # Unfortunately, more modern Xcode versions no longer seem to support | ||
| # Qt 5.15.2. Therefore upgrading to Qt6 is needed in the medium term (#2711) |
There was a problem hiding this comment.
So does this "Fixes: #2711", too? Or was this comment a bit overoptimistic?
pljones
approved these changes
Dec 24, 2024
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.
Short description of changes
Upgrades the iOS build to Qt6. There are still some UI issues (e.g. the mixer has some overflows, see #3406)
CHANGELOG: iOS: Upgrade build to Qt 6
Context: Fixes an issue?
Related to: #3406
Does this change need documentation? What needs to be documented and how?
Yes. This will make the UX worse due to UI bugs introduced with Qt6.
Status of this Pull Request
Testing on an actual device. Will do that soon.
What is missing until this pull request can be merged?
Testing.
Checklist