diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-02-03 22:43:41 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-02-03 22:43:41 +0200 |
commit | 3814414721b2a304b7cf163183ae2186afdf6c38 (patch) | |
tree | f6d6de0e93ef90cde5eece8829204429d0b68042 | |
parent | 61db1037402fe291009e4c3d76723b14ac685e01 (diff) | |
download | meson-3814414721b2a304b7cf163183ae2186afdf6c38.zip meson-3814414721b2a304b7cf163183ae2186afdf6c38.tar.gz meson-3814414721b2a304b7cf163183ae2186afdf6c38.tar.bz2 |
And the same for uic.
-rw-r--r-- | dependencies.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/dependencies.py b/dependencies.py index 8f157ae..a8f262e 100644 --- a/dependencies.py +++ b/dependencies.py @@ -440,9 +440,16 @@ class Qt5Dependency(Dependency): if self.uic.found(): up = subprocess.Popen([self.uic.get_command(), '-v'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - uic_ver = up.communicate()[1].decode().strip() - if 'version 5.' not in uic_ver: - raise DependencyException('Uic compiler is not for Qt 5. Output: %s' % uic_ver) + (stdout, stderr) = up.communicate() + stdout = stdout.decode().strip() + stderr = stderr.decode().strip() + if 'version 5.' in stderr: + uic_ver = stderr + elif '5.' in stdout: + uic_ver = stdout + else: + raise DependencyException('Uic compiler is not for Qt 5. Output:\n%s\n%s' % + (stdout, stderr)) mlog.log(' uic:', mlog.green('YES'), '(%s)' % uic_ver) else: mlog.log(' uic:', mlog.red('NO')) |