diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-02 12:45:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-02 17:36:45 +0200 |
| commit | bdcd86c03e1b5c66dec21746d4d3596eb556b77b (patch) | |
| tree | 5d9d24c69a704e5c67ac620ce1c04d2373df0728 /src/plugins/platforms/windows/qwindowswindow.cpp | |
| parent | da888ba53904af75c462af9f753191f25840e51f (diff) | |
| parent | ccc6efb6e91756451ffd50d51f7f3ae05bc6df0b (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index db06525508..c8eaded38d 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -880,7 +880,7 @@ QWindowsWindow::QWindowsWindow(QWindow *aWindow, const QWindowsWindowData &data) if (aWindow->surfaceType() == QWindow::OpenGLSurface) { setFlag(OpenGLSurface); #if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC) - if (QOpenGLContext::openGLModuleType() != QOpenGLContext::DesktopGL) + if (QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL) setFlag(OpenGL_ES2); #endif } |