qt module: also prefer the changed name scheme for the tools
Although Qt6 has decided these are "internal" commands and should never
be run directly, so they don't get symlinked to /usr/bin at all, and are
only available in the qt_dep.bindir anyway.
But, the general naming pattern should be followed on principle.
@@ -133,8 +133,10 @@ class QtBaseModule(ExtensionModule):
yield os.path.join(qt_dep.bindir, b), b
if qt_dep.libexecdir:
yield os.path.join(qt_dep.libexecdir, b), b
- # prefer the <tool>-qt<version> of the tool to the plain one, as we
+ # prefer the (official) <tool><version> or (unofficial) <tool>-qt<version>
+ # of the tool to the plain one, as we
# don't know what the unsuffixed one points to without calling it.
+ yield f'{b}{qt_dep.qtver}', b
yield f'{b}-qt{qt_dep.qtver}', b
yield b, b
