Update to Qt 6.8.1 #3386
Merged
Update to Qt 6.8.1 #3386
+98
−56
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
Signed-off-by: Jared Van Bortel <[email protected]>
Signed-off-by: Jared Van Bortel <[email protected]>
Signed-off-by: Jared Van Bortel <[email protected]>
Signed-off-by: Jared Van Bortel <[email protected]>
- macOS has no debug_info anymore - qt5compat is now addons.qt5compat - gcc_64 is now linux_gcc_64 Signed-off-by: Jared Van Bortel <[email protected]>
Signed-off-by: Jared Van Bortel <[email protected]>
Signed-off-by: Jared Van Bortel <[email protected]>
- Update the Windows ARM build since it is new and also uses Qt 6.5. - Remove the WINDEPLOYQT hack since it is no longer needed. Qt 6.8's ARM build provides windeployqt, so we don't need to force use of the native x86_64 one anymore. Signed-off-by: Jared Van Bortel <[email protected]>
|
I'm going to test the newly modified Windows ARM build before we merge this. |
|
The ARM build is missing the Qt libs. I forgot that although Qt 6.8 ships windeployqt in the cross-compiled ARM version, it's actually compiled as an ARM executable so it's unusable on the build machine. Will fix. |
Signed-off-by: Jared Van Bortel <[email protected]>
|
At first I thought my last commit didn't fix the issue, but upon further investigation it did. I had downloaded the wrong installer the first time. |
manyoso
approved these changes
Jan 24, 2025
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.
Qt 6.5.1 has been EOL for over a year. Update to Qt 6.8.1.
Closes #2975, which included more involved refactoring that was never completed. Untangling the copy-pasted CI scripts is probably not going to happen anytime soon.
Conflicts with #3385 until one of them is merged.