aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-02-03 22:47:06 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2014-02-03 22:47:06 +0200
commit757561728057a7d9167f08629df02b51ab6b1a6c (patch)
tree56f2d57f0e5909ff1fc29ef8d2a9f58c666d9fc9
parent3814414721b2a304b7cf163183ae2186afdf6c38 (diff)
downloadmeson-757561728057a7d9167f08629df02b51ab6b1a6c.zip
meson-757561728057a7d9167f08629df02b51ab6b1a6c.tar.gz
meson-757561728057a7d9167f08629df02b51ab6b1a6c.tar.bz2
And for rcc, which I totally guessed would be coming.
-rw-r--r--dependencies.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/dependencies.py b/dependencies.py
index a8f262e..b26972b 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -454,11 +454,18 @@ class Qt5Dependency(Dependency):
else:
mlog.log(' uic:', mlog.red('NO'))
if self.rcc.found():
- up = subprocess.Popen([self.rcc.get_command(), '-v'],
+ rp = subprocess.Popen([self.rcc.get_command(), '-v'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- rcc_ver = up.communicate()[1].decode().strip()
- if 'version 5.' not in rcc_ver:
- raise DependencyException('Rcc compiler is not for Qt 5. Output: %s' % rcc_ver)
+ (stdout, stderr) = rp.communicate()
+ stdout = stdout.decode().strip()
+ stderr = stderr.decode().strip()
+ if 'version 5.' in stderr:
+ rcc_ver = stderr
+ elif '5.' in stdout:
+ rcc_ver = stdout
+ else:
+ raise DependencyException('Rcc compiler is not for Qt 5. Output:\n%s\n%s' %
+ (stdout, stderr))
mlog.log(' rcc:', mlog.green('YES'), '(%s)' % rcc_ver)
else:
mlog.log(' rcc:', mlog.red('NO'))