Commit d00ad751 authored by Laszlo Agocs's avatar Laszlo Agocs
Browse files

ANGLE is never available on WinCE


Change-Id: I853774af533d7f4b37b4789344e531d2688f91f5
Reviewed-by: default avatarAlex Blasche <alexander.blasche@digia.com>
parent bc1fa076
Branches
Tags
No related merge requests found
Showing with 2 additions and 2 deletions
...@@ -66,7 +66,7 @@ inline bool QMediaOpenGLHelper::isANGLE() ...@@ -66,7 +66,7 @@ inline bool QMediaOpenGLHelper::isANGLE()
#else #else
bool isANGLE = false; bool isANGLE = false;
# if defined(Q_OS_WIN) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)) # if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC))
if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) { if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) {
// Although unlikely, technically LibGLES could mean a non-ANGLE EGL/GLES2 implementation too. // Although unlikely, technically LibGLES could mean a non-ANGLE EGL/GLES2 implementation too.
// Verify that it is indeed ANGLE. // Verify that it is indeed ANGLE.
...@@ -98,7 +98,7 @@ inline bool QMediaOpenGLHelper::isANGLE() ...@@ -98,7 +98,7 @@ inline bool QMediaOpenGLHelper::isANGLE()
# endif // QT_OPENGL_ES_2_ANGLE_STATIC # endif // QT_OPENGL_ES_2_ANGLE_STATIC
} }
# endif // Q_OS_WIN && (QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC) # endif // Q_OS_WIN && !Q_OS_WINCE && (QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC)
return isANGLE; return isANGLE;
#endif // Q_OS_WINRT #endif // Q_OS_WINRT
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment