From d677e635fcdb4178ca75e5e4492f13dc38b84e12 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 1 Feb 2019 14:27:11 +0530 Subject: [PATCH] meson: qmlgl plugin iOS definitions Tested with cross-ios-arm64 and cross-ios-x86, since those two are the only archs shipped with the official Qt binaries. --- ext/qt/meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ext/qt/meson.build b/ext/qt/meson.build index 4fd1170e09..690d01e797 100644 --- a/ext/qt/meson.build +++ b/ext/qt/meson.build @@ -18,7 +18,7 @@ moc_headers = [ if have_cxx and build_gstgl qt5_mod = import('qt5') qt5qml_dep = dependency('qt5', modules : ['Core', 'Gui', 'Qml', 'Quick'], - required: get_option('qt5')) + required: get_option('qt5'), static: host_machine.system() == 'ios') # FIXME Add a way to get that information out of the qt5 module moc = find_program('moc-qt5', 'moc', required : get_option('qt5')) @@ -121,7 +121,6 @@ if have_cxx and build_gstgl endif endif - # FIXME: iOS definitions if gst_gl_have_window_cocoa and gst_gl_have_platform_cgl # FIXME: automagic qt5macextras = dependency('qt5', modules : ['MacExtras'], required : false) @@ -132,6 +131,13 @@ if have_cxx and build_gstgl endif endif + if gst_gl_have_window_eagl and gst_gl_have_platform_eagl + if host_machine.system() == 'ios' + qt_defines += ['-DHAVE_QT_IOS'] + have_qt_windowing = true + endif + endif + if have_qt_windowing # Build it! moc_files = qt5_mod.preprocess(moc_headers : moc_headers)