diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-13 13:56:49 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-02-03 12:46:38 +0000 |
| commit | 7c787f11dd2348e0fd2cecc231f15a0acde7481a (patch) | |
| tree | 10ac13b4b806dea9d1783c72057982252e06282f /src/plugins/directshow/player/directshowvideorenderercontrol.h | |
| parent | dd4c9cbd405730b360cb6aed572006078d88cecb (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/directshow/player/directshowvideorenderercontrol.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowvideorenderercontrol.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.h b/src/plugins/directshow/player/directshowvideorenderercontrol.h index 9d1a23933..1df5d6864 100644 --- a/src/plugins/directshow/player/directshowvideorenderercontrol.h +++ b/src/plugins/directshow/player/directshowvideorenderercontrol.h @@ -44,8 +44,10 @@ #include "qvideorenderercontrol.h" +#include <QtMultimedia/private/qtmultimedia-config_p.h> + class DirectShowEventLoop; -#ifdef HAVE_EVR +#if QT_CONFIG(evr) class EVRCustomPresenter; #endif @@ -70,7 +72,7 @@ private: DirectShowEventLoop *m_loop; QAbstractVideoSurface *m_surface; IBaseFilter *m_filter; -#ifdef HAVE_EVR +#if QT_CONFIG(evr) EVRCustomPresenter *m_evrPresenter; #endif }; |