Allow querying for alternate Qt6 libexec directory #12870
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
cho-m
commented
Oct 11, 2024
This is closer to how Qt6's moc.prf finds moc, i.e.
```
qtPrepareLibExecTool(QMAKE_MOC, moc)
...
defineTest(qtPrepareLibExecTool) {
isEmpty(instloc): instloc = "$$[QT_HOST_LIBEXECS]"
qtPrepareTool($$1, $$2, $$3, $$4, $$instloc)
}
```
cho-m
force-pushed
the
qt6-lookup-libexec
branch
from
3bf2ecf to
f1604db
Compare
6 tasks
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 closer to how Qt6's moc.prf finds moc, i.e.
Specifically adding for Homebrew - Homebrew/homebrew-core#193751
However, I think this will help other repositories/distros that don't use
QT_HOME / libexec / moc. For example, Arch Linux usesQT_HOME / mocand thus needs to modify the script1.Similar handling in Meson2 though they also fall back on
QT_INSTALL_LIBEXECS. Not sure if that is actually needed so left out for now.Footnotes
https://gitlab.archlinux.org/archlinux/packaging/packages/mame/-/blob/main/PKGBUILD?ref_type=heads#L58-59 ↩
https://github.com/mesonbuild/meson/blob/master/mesonbuild/dependencies/qt.py#L65-L68 ↩