From 49562cf850fbceba9732e27ccc34a29069ced2b8 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Wed, 26 Dec 2018 17:35:12 +0800 Subject: [PATCH 1/2] Prefer qtmultimedia instead of gstreamer Signed-off-by: Jeffy Chen --- Tools/qmake/mkspecs/features/features.prf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 328a8be..e0161cc 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -99,8 +99,13 @@ defineTest(detectFeatures) { # Both desktop and GLES2 support (only on Windows at this point) qtConfig(dynamicgl): WEBKIT_CONFIG += have_dynamicgl + # HTML5 Media Support for builds with qtmultimedia + qtHaveModule(multimediawidgets) { + WEBKIT_CONFIG += video use_qt_multimedia + } + # HTML5 Media Support for builds with GStreamer - unix:!mac:qtConfig(pkg-config) { + !enable?(video):unix:!mac:qtConfig(pkg-config) { packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { WEBKIT_CONFIG += video use_gstreamer } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { @@ -109,10 +114,6 @@ defineTest(detectFeatures) { use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video } - !enable?(video):qtHaveModule(multimediawidgets) { - WEBKIT_CONFIG += video use_qt_multimedia - } - !enable?(video) { CONFIGURE_WARNINGS += "Missing GStreamer or QtMultimedia, disabling HTML5 media element support" } -- 2.11.0