diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:25:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:25:10 +0100 |
| commit | 7610f6e9ba8b92df6d18b94fcec982064dffacbd (patch) | |
| tree | 65653559c62cc451258543b87ff971371e8d8e05 /src/plugins/common/evr | |
| parent | ac6f9d27b1610356303714c3f8d2f2ab2ca5883a (diff) | |
| parent | 365e05bad8c4a42a449eeef257a16c6f8faca318 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I2e4e9cca01d63ed0d1e7f71c7a58322390696036
Diffstat (limited to 'src/plugins/common/evr')
| -rw-r--r-- | src/plugins/common/evr/evrd3dpresentengine.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/common/evr/evrd3dpresentengine.h b/src/plugins/common/evr/evrd3dpresentengine.h index e05cf0d21..d181689ec 100644 --- a/src/plugins/common/evr/evrd3dpresentengine.h +++ b/src/plugins/common/evr/evrd3dpresentengine.h @@ -40,13 +40,14 @@ #ifndef EVRD3DPRESENTENGINE_H #define EVRD3DPRESENTENGINE_H -#include <EGL/egl.h> #include <QMutex> -#include <d3d9types.h> #include <QVideoSurfaceFormat> +#include <d3d9.h> + #if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC) -#define MAYBE_ANGLE +# include <EGL/egl.h> +# define MAYBE_ANGLE #endif QT_BEGIN_NAMESPACE |