aboutsummaryrefslogtreecommitdiff
path: root/dependencies.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-06-28 10:49:54 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-06-28 10:49:54 +0300
commit5f65255a66f8cbc6f5637bca2577e416a2c812f9 (patch)
tree2182c46d03306c465365dc73b5e8987b8767ffbe /dependencies.py
parentd610f4729297e52f4f4b1b76790ae68a0145bac6 (diff)
downloadmeson-5f65255a66f8cbc6f5637bca2577e416a2c812f9.zip
meson-5f65255a66f8cbc6f5637bca2577e416a2c812f9.tar.gz
meson-5f65255a66f8cbc6f5637bca2577e416a2c812f9.tar.bz2
Better description for Qt5 tools.
Diffstat (limited to 'dependencies.py')
-rw-r--r--dependencies.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/dependencies.py b/dependencies.py
index cdbd516..1f9f0d2 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -458,7 +458,8 @@ class Qt5Dependency(Dependency):
raise DependencyException('Moc preprocessor is not for Qt 5. Output:\n%s\n%s' %
(stdout, stderr))
if not qt5toolinfo_printed:
- mlog.log(' moc:', mlog.green('YES'), '(%s)' % moc_ver)
+ mlog.log(' moc:', mlog.green('YES'), '(%s %s)' % \
+ (self.moc.fullpath, moc_ver.split()[-1]))
else:
if not qt5toolinfo_printed:
mlog.log(' moc:', mlog.red('NO'))
@@ -476,7 +477,8 @@ class Qt5Dependency(Dependency):
raise DependencyException('Uic compiler is not for Qt 5. Output:\n%s\n%s' %
(stdout, stderr))
if not qt5toolinfo_printed:
- mlog.log(' uic:', mlog.green('YES'), '(%s)' % uic_ver)
+ mlog.log(' uic:', mlog.green('YES'), '(%s %s)' % \
+ (self.uic.fullpath, uic_ver.split()[-1]))
else:
if not qt5toolinfo_printed:
mlog.log(' uic:', mlog.red('NO'))
@@ -494,7 +496,8 @@ class Qt5Dependency(Dependency):
raise DependencyException('Rcc compiler is not for Qt 5. Output:\n%s\n%s' %
(stdout, stderr))
if not qt5toolinfo_printed:
- mlog.log(' rcc:', mlog.green('YES'), '(%s)' % rcc_ver)
+ mlog.log(' rcc:', mlog.green('YES'), '(%s %s)'\
+ % (self.rcc.fullpath, rcc_ver.split()[-1]))
else:
if not qt5toolinfo_printed:
mlog.log(' rcc:', mlog.red('NO'))