qt: Only check for moc-qt5/moc in PATH if not cross-compiling
authorNirbheek Chauhan <nirbheek@centricular.com>
Wed, 24 Jun 2020 16:34:55 +0000 (22:04 +0530)
committerNirbheek Chauhan <nirbheek@centricular.com>
Sat, 27 Jun 2020 18:46:53 +0000 (00:16 +0530)
This is an extra check that's only needed for working around Linux
distribution packaging. `moc` is not required in the cross file.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/640>

ext/qt/meson.build

index c86e86a..38b8a25 100644 (file)
@@ -46,7 +46,7 @@ qt5qml_dep = dependency('qt5', modules : ['Core', 'Gui', 'Qml', 'Quick'],
 # that it's installed.
 # We don't do this check on other OSes because they need to be able to simply
 # point the `QMAKE` env var to `qmake` to build against a particular Qt5.
-if host_system == 'linux'
+if host_system == 'linux' and not meson.is_cross_build()
   moc = find_program('moc-qt5', 'moc', required : qt5_option)
 else
   # We only check if `moc` was found, and then discard it, so we can fake it.