diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-10-25 02:14:46 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-10-30 11:42:00 +0200 |
| commit | d4eec9664bb96a093b92c3e1f565806686ea0ccb (patch) | |
| tree | 289945890ab661bb00124c9ba4f9e548dfeb0f58 | |
| parent | fe24292ae338a5767208abb7ea9634e5dd5c0681 (diff) | |
| download | meson-d4eec9664bb96a093b92c3e1f565806686ea0ccb.zip meson-d4eec9664bb96a093b92c3e1f565806686ea0ccb.tar.gz meson-d4eec9664bb96a093b92c3e1f565806686ea0ccb.tar.bz2 | |
qt: dependency: Strip tool versions from newlines
When finding the Qt compilation tools (moc, uic, rcc, lrelease), the
version strings contain a trailing newline character. This results in a
stray newline in the meson log:
Detecting Qt5 tools
Program /usr/lib64/qt5/bin/moc found: YES 5.14.2
(/usr/lib64/qt5/bin/moc)
Program /usr/lib64/qt5/bin/uic found: YES 5.14.2
(/usr/lib64/qt5/bin/uic)
Program /usr/lib64/qt5/bin/rcc found: YES 5.14.2
(/usr/lib64/qt5/bin/rcc)
Program /usr/lib64/qt5/bin/lrelease found: YES 5.14.2
(/usr/lib64/qt5/bin/lrelease)
Strip the version to avoid this, resulting in a cleaner log:
Detecting Qt5 tools
Program /usr/lib64/qt5/bin/moc found: YES 5.14.2 (/usr/lib64/qt5/bin/moc)
Program /usr/lib64/qt5/bin/uic found: YES 5.14.2 (/usr/lib64/qt5/bin/uic)
Program /usr/lib64/qt5/bin/rcc found: YES 5.14.2 (/usr/lib64/qt5/bin/rcc)
Program /usr/lib64/qt5/bin/lrelease found: YES 5.14.2 (/usr/lib64/qt5/bin/lrelease)
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 5dffd3a..baf8e94 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -258,7 +258,7 @@ class QtBaseDependency(ExternalDependency): care = out else: care = err - return care.split(' ')[-1].replace(')', '') + return care.split(' ')[-1].replace(')', '').strip() p = interp_obj.find_program_impl([b], required=False, version_func=get_version, |