overlay: Fix qt support detection
authorXavier Claessens <xavier.claessens@collabora.com>
Mon, 30 Mar 2020 19:16:29 +0000 (15:16 -0400)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Wed, 30 Mar 2022 22:54:57 +0000 (22:54 +0000)
On Ubuntu moc-qt5 command is called moc. This requires Meson 0.54.0 for
the new has_tools() method.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2075>

subprojects/gst-plugins-base/tests/examples/overlay/meson.build

index 65038db..8d0019c 100644 (file)
@@ -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],