|
|
@ -122,8 +122,6 @@ class QtBaseModule(ExtensionModule): |
|
|
|
# It is important that this list does not change order as the order of |
|
|
|
# It is important that this list does not change order as the order of |
|
|
|
# the returned ExternalPrograms will change as well |
|
|
|
# the returned ExternalPrograms will change as well |
|
|
|
bins = ['moc', 'uic', 'rcc', 'lrelease'] |
|
|
|
bins = ['moc', 'uic', 'rcc', 'lrelease'] |
|
|
|
found = {b: NonExistingExternalProgram(name=f'{b}-qt{qt_dep.qtver}') |
|
|
|
|
|
|
|
for b in bins} |
|
|
|
|
|
|
|
wanted = f'== {qt_dep.version}' |
|
|
|
wanted = f'== {qt_dep.version}' |
|
|
|
|
|
|
|
|
|
|
|
def gen_bins() -> T.Generator[T.Tuple[str, str], None, None]: |
|
|
|
def gen_bins() -> T.Generator[T.Tuple[str, str], None, None]: |
|
|
@ -136,7 +134,7 @@ class QtBaseModule(ExtensionModule): |
|
|
|
yield b, b |
|
|
|
yield b, b |
|
|
|
|
|
|
|
|
|
|
|
for b, name in gen_bins(): |
|
|
|
for b, name in gen_bins(): |
|
|
|
if found[name].found(): |
|
|
|
if getattr(self, name).found(): |
|
|
|
continue |
|
|
|
continue |
|
|
|
|
|
|
|
|
|
|
|
if name == 'lrelease': |
|
|
|
if name == 'lrelease': |
|
|
|