From ed457fe08fbd34195749a6076f78011e13a9b34f Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 24 Jun 2020 22:04:55 +0530 Subject: [PATCH] qt: Only check for moc-qt5/moc in PATH if not cross-compiling 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: --- ext/qt/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/qt/meson.build b/ext/qt/meson.build index c86e86a55b..38b8a25908 100644 --- a/ext/qt/meson.build +++ b/ext/qt/meson.build @@ -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.