From 28f97a94ec5566877c0dd0dc5820349606a0ffa3 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 21 Nov 2016 20:20:11 +0200 Subject: Fix building the WMF plugin 9df63fd6 made it possible to build only the audio decoder service from the WMF plugin. When that change was merged to 5.8 it was not ported to the new configuration system. Added a new '-mediaplayer-backend' configure option to select the media player backend to use on Windows. '-wmf-backend' is kept for backward compatibility. Change-Id: I902b2e4147f9a05b92118152020afc2638bf41e1 Reviewed-by: Oswald Buddenhagen --- src/plugins/directshow/directshow.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/directshow/directshow.pro') diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 5eb4fbc96..7fe02e662 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -13,7 +13,7 @@ SOURCES += dsserviceplugin.cpp mingw: DEFINES += NO_DSHOW_STRSAFE include(helpers/helpers.pri) -!qtConfig(wmf-backend): include(player/player.pri) +qtConfig(directshow-player): include(player/player.pri) include(camera/camera.pri) OTHER_FILES += \ -- cgit v1.2.3 From 7c787f11dd2348e0fd2cecc231f15a0acde7481a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 13 Dec 2016 13:56:49 +0100 Subject: DirectShow: Port to new configure system (evr, wmsdk) Replace old legacy defines by QT_CONFIG. Fixes warnings when using MinGW: qtmultimedia/src/multimedia/qtmultimedia-config.h:4:0: warning: "QT_NO_WMSDK" redefined Change-Id: Ifbfc2cea3bf5bfd06d94fd70e6ea4afb6d6fbb4b Reviewed-by: Lars Knoll --- src/plugins/directshow/directshow.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/plugins/directshow/directshow.pro') diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 7fe02e662..8e31527da 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -8,8 +8,6 @@ win32:!qtHaveModule(opengl)|qtConfig(dynamicgl) { HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp -!qtConfig(wmsdk): DEFINES += QT_NO_WMSDK - mingw: DEFINES += NO_DSHOW_STRSAFE include(helpers/helpers.pri) -- cgit v1.2.3