projects / platform / upstream / qtmultimedia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2020b03)
WinRT: Fix compilation after ANGLE update
authorMaurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Mon, 17 Nov 2014 12:51:17 +0000 (13:51 +0100)
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>
Mon, 17 Nov 2014 14:58:59 +0000 (15:58 +0100)
Header inclusion is not needed, hence remove it for WinRT.

Change-Id: I8117439849143975cad3dc14e36118b8da4621de
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
src/multimedia/qmediaopenglhelper_p.h patch | blob | history

diff --git a/src/multimedia/qmediaopenglhelper_p.h b/src/multimedia/qmediaopenglhelper_p.h
index 0dbd79d..bb445b6 100644 (file)
--- 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
 
Domain: UI Framework / Qt;