diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 13:45:17 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 13:45:17 +0100 |
| commit | f2b3363c119fe2de7253913f7a13fe1395d8d29f (patch) | |
| tree | 7f8fdc1bff098a1c562a6aaf47057de6b164ce7b /src/multimedia/qmediaopenglhelper_p.h | |
| parent | 2020b032e83d1b61736a80a6815635aa7451deed (diff) | |
| parent | 96407d8d8980f5dee7a0848366c20584dbd8c321 (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: Iec2c793710c95919975aa3c03144d915ca5fa84f
Diffstat (limited to 'src/multimedia/qmediaopenglhelper_p.h')
| -rw-r--r-- | src/multimedia/qmediaopenglhelper_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/qmediaopenglhelper_p.h b/src/multimedia/qmediaopenglhelper_p.h index 0dbd79d47..bb445b693 100644 --- a/src/multimedia/qmediaopenglhelper_p.h +++ b/src/multimedia/qmediaopenglhelper_p.h @@ -47,7 +47,7 @@ #include <QtGui/QOpenGLContext> -#if defined(Q_OS_WIN) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)) #include <EGL/egl.h> #endif |