From 368f7b2cf2780696dd2e7680e8126160976a85d9 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 30 Mar 2020 15:16:29 -0400 Subject: [PATCH] overlay: Fix qt support detection On Ubuntu moc-qt5 command is called moc. This requires Meson 0.54.0 for the new has_tools() method. Part-of: --- subprojects/gst-plugins-base/tests/examples/overlay/meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/subprojects/gst-plugins-base/tests/examples/overlay/meson.build b/subprojects/gst-plugins-base/tests/examples/overlay/meson.build index 65038db..8d0019c 100644 --- a/subprojects/gst-plugins-base/tests/examples/overlay/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/overlay/meson.build @@ -16,9 +16,7 @@ if x11_dep.found() qt5widgets_dep = dependency('qt5', modules : ['Core', 'Gui', 'Widgets'], required: get_option('examples')) - # FIXME Add a way to get that information out of the qt5 module - moc = find_program('moc-qt5', required : get_option('examples')) - if qt5widgets_dep.found() and moc.found() + if qt5widgets_dep.found() and qt5_mod.has_tools(required: get_option('examples')) executable('qt-videooverlay', 'qt-videooverlay.cpp', cpp_args : gst_plugins_base_args, include_directories: [configinc, libsinc], -- 2.7.4