mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

qt: also check for un-suffixed moc

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/qt/meson.build
View file

@ -19,7 +19,7 @@ if have_cxx and build_gstgl
qt5qml_dep = dependency('qt5', modules : ['Core', 'Gui', 'Qml', 'Quick'], required: false) qt5qml_dep = dependency('qt5', modules : ['Core', 'Gui', 'Qml', 'Quick'], required: false)
# FIXME Add a way to get that information out of the qt5 module # 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() if qt5qml_dep.found() and moc.found()
optional_deps = [] optional_deps = []
qt_defines = [] qt_defines = []
@ -97,13 +97,13 @@ if have_cxx and build_gstgl
endif endif
if gst_gl_have_platform_wgl and gst_gl_have_window_win32 if gst_gl_have_platform_wgl and gst_gl_have_window_win32
# for wglMakeCurrent() # for wglMakeCurrent()
opengl32_dep = cc.find_library('opengl32', required : false) opengl32_dep = cc.find_library('opengl32', required : false)
if opengl32_dep.found() if opengl32_dep.found()
qt_defines += ['-DHAVE_QT_WIN32'] qt_defines += ['-DHAVE_QT_WIN32']
optional_deps += opengl32_dep optional_deps += opengl32_dep
have_qt_windowing = true have_qt_windowing = true
endif endif
endif endif
# FIXME: OSX/iOS definitions # FIXME: OSX/iOS definitions

2
tests/examples/qt/qmlsink/meson.build
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) 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 # 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() if qt5qml_deps.found() and moc.found()
qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsink.qrc') qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsink.qrc')
executable('qmlsink', sources, qt_preprocessed, executable('qmlsink', sources, qt_preprocessed,

2
tests/examples/qt/qmlsrc/meson.build
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) 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 # 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() if qt5qml_deps.found() and moc.found()
qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsrc.qrc') qt_preprocessed = qt5_mod.preprocess(qresources : 'qmlsrc.qrc')
executable('qmlsrc', sources, qt_preprocessed, executable('qmlsrc', sources, qt_preprocessed,