qt: also check for un-suffixed moc

e.g. Qt windows installer doesn't have suffixes
This commit is contained in:
Matthew Waters 2018-06-07 13:56:03 +10:00
parent 1840159d0b
commit ee046864d8
3 changed files with 6 additions and 6 deletions

View file

@ -19,7 +19,7 @@ if have_cxx and build_gstgl
qt5qml_dep = dependency('qt5', modules : ['Core', 'Gui', 'Qml', 'Quick'], required: false)
# FIXME Add a way to get that information out of the qt5 module
moc = find_program('moc-qt5', required : false)
moc = find_program('moc-qt5', 'moc', required : false)
if qt5qml_dep.found() and moc.found()
optional_deps = []
qt_defines = []

View file

@ -7,7 +7,7 @@ if have_cxx and build_gstgl and gstgl_dep.found()
qt5qml_deps = dependency('qt5', modules : ['Core', 'Gui', 'Widgets', 'Qml', 'Quick'], required: false)
# FIXME Add a way to get that information out of the qt5 module
moc = find_program('moc-qt5', required : false)
moc = find_program('moc-qt5', 'moc', required : false)
if qt5qml_deps.found() and moc.found()
qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsink.qrc')
executable('qmlsink', sources, qt_preprocessed,

View file

@ -7,7 +7,7 @@ if have_cxx and build_gstgl and gstgl_dep.found()
qt5qml_deps = dependency('qt5', modules : ['Core', 'Gui', 'Widgets', 'Qml', 'Quick'], required: false)
# FIXME Add a way to get that information out of the qt5 module
moc = find_program('moc-qt5', required : false)
moc = find_program('moc-qt5', 'moc', required : false)
if qt5qml_deps.found() and moc.found()
qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsrc.qrc')
executable('qmlsrc', sources, qt_preprocessed,