diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/directshow/player/directshowvideorenderercontrol.h | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/directshow/player/directshowvideorenderercontrol.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowvideorenderercontrol.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.h b/src/plugins/directshow/player/directshowvideorenderercontrol.h index 9d1a23933..36c5b2248 100644 --- a/src/plugins/directshow/player/directshowvideorenderercontrol.h +++ b/src/plugins/directshow/player/directshowvideorenderercontrol.h @@ -40,12 +40,15 @@ #ifndef DIRECTSHOWVIDEORENDERERCONTROL_H #define DIRECTSHOWVIDEORENDERERCONTROL_H +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include <dshow.h> #include "qvideorenderercontrol.h" +#include <QtMultimedia/private/qtmultimedia-config_p.h> + class DirectShowEventLoop; -#ifdef HAVE_EVR +#if QT_CONFIG(evr) class EVRCustomPresenter; #endif @@ -70,7 +73,7 @@ private: DirectShowEventLoop *m_loop; QAbstractVideoSurface *m_surface; IBaseFilter *m_filter; -#ifdef HAVE_EVR +#if QT_CONFIG(evr) EVRCustomPresenter *m_evrPresenter; #endif }; |