Repository navigation
audacity: select native Qt tools when cross compiling - #561198
Draft
johnrichardrinehart wants to merge 1 commit into
Draft
johnrichardrinehart wants to merge 1 commit into
johnrichardrinehart wants to merge 1 commit into
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
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.
Depends on #561181 for Qt Declarative to provide Qt Quick when cross-compiled.
Description of changes
Use the executable output of native Qt Tools instead of its development output. The development output propagates native Qt libraries and triggers the mismatched-Qt setup-hook error when target Qt libraries are also present.
For cross builds, supply
QT_HOST_PATHand the native QML, Quick, and ShaderTools CMake tool-package directories. Keep target Qt libraries inbuildInputs. Native Linux and Darwin builds do not receive these cross-only CMake flags.This follows cross-build verification of #559623. No changes to Audacity 3.
Verification
--long-versionand--plugin-registration-self-testboth exited 0 withQT_QPA_PLATFORM=offscreen; Nyquist resources were found.The successful overlay also set
Qt6QuickCompilerTools_DIR; CMake reported it unused, so that setting is omitted here. The native configurations were evaluated, not rebuilt.AI assistance was used to investigate, implement, and validate this change.