[Qt module] Added workaround for qt tools version detection

Depending on the tool (moc, uic, rcc, lrelease), the Qt version
(4.8, 5.7, 5.9) and the distribution (Fedora, debian,...) it seems you
cannot predict which of -v or -version will be supported.

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
pull/2702/head
Alexis Jeandet 7 years ago committed by Jussi Pakkanen
parent 746e70c0da
commit 120f7a4c40
  1. 6
      mesonbuild/modules/qt.py

@ -49,7 +49,11 @@ class QtBaseModule:
# What kind of an idiot thought that was a good idea?
for compiler, compiler_name in ((self.moc, "Moc"), (self.uic, "Uic"), (self.rcc, "Rcc"), (self.lrelease, "lrelease")):
if compiler.found():
stdout, stderr = Popen_safe(compiler.get_command() + ['-version'])[1:3]
# Workaround since there is no easy way to know which tool/version support which flag
for flag in ['-v', '-version']:
p, stdout, stderr = Popen_safe(compiler.get_command() + [flag])[0:3]
if p.returncode == 0:
break
stdout = stdout.strip()
stderr = stderr.strip()
if 'Qt {}'.format(self.qt_version) in stderr:

Loading…
Cancel
Save