diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-19 12:37:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-19 12:37:56 -0500 |
| commit | 0cf18eb3bc6f872324971610f92d54d63049b9c9 (patch) | |
| tree | 002840679e8cb2d179adb156c3c92f69bca3ae00 /mesonbuild/modules/qt4.py | |
| parent | aba099a4910c2e578c0aefbd20bda666b6a6856e (diff) | |
| parent | f23a4a8b27b2a2e46185869bb736b1ab843cdcf3 (diff) | |
| download | meson-0cf18eb3bc6f872324971610f92d54d63049b9c9.zip meson-0cf18eb3bc6f872324971610f92d54d63049b9c9.tar.gz meson-0cf18eb3bc6f872324971610f92d54d63049b9c9.tar.bz2 | |
Merge pull request #1356 from centricular/cross-platform-unit-tests
Run unit tests on more platforms, and more
Diffstat (limited to 'mesonbuild/modules/qt4.py')
| -rw-r--r-- | mesonbuild/modules/qt4.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 33c9f80..7146739 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -48,7 +48,7 @@ class Qt4Module(ExtensionModule): raise MesonException('Moc preprocessor is not for Qt 4. Output:\n%s\n%s' % (stdout, stderr)) mlog.log(' moc:', mlog.green('YES'), '(%s, %s)' % - (' '.join(self.moc.fullpath), moc_ver.split()[-1])) + (self.moc.get_path(), moc_ver.split()[-1])) else: mlog.log(' moc:', mlog.red('NO')) if self.uic.found(): @@ -61,7 +61,7 @@ class Qt4Module(ExtensionModule): raise MesonException('Uic compiler is not for Qt4. Output:\n%s\n%s' % (stdout, stderr)) mlog.log(' uic:', mlog.green('YES'), '(%s, %s)' % - (' '.join(self.uic.fullpath), uic_ver.split()[-1])) + (self.uic.get_path(), uic_ver.split()[-1])) else: mlog.log(' uic:', mlog.red('NO')) if self.rcc.found(): @@ -74,7 +74,7 @@ class Qt4Module(ExtensionModule): raise MesonException('Rcc compiler is not for Qt 4. Output:\n%s\n%s' % (stdout, stderr)) mlog.log(' rcc:', mlog.green('YES'), '(%s, %s)' - % (' '.join(self.rcc.fullpath), rcc_ver.split()[-1])) + % (self.rcc.get_path(), rcc_ver.split()[-1])) else: mlog.log(' rcc:', mlog.red('NO')) self.tools_detected = True |