From d4eec9664bb96a093b92c3e1f565806686ea0ccb Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 25 Oct 2020 02:14:46 +0300 Subject: 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 --- mesonbuild/dependencies/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/dependencies') diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 5dffd3a40..baf8e94c0 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, -- cgit v1.2.3