diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-11-21 19:38:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-21 18:53:13 +0100 |
| commit | 36e9e08dcc5a09b23d9231ed7b6c25ceff9eb4d0 (patch) | |
| tree | 17975487d9c28c39f4ca5ea9ba1648c403b22b50 /src/gui | |
| parent | 55a4db4f47013662970144bb0657e1686186ce05 (diff) | |
QOpenGLTextureHelper (Windows): Don't load desktop DLL when GLES2 is used
GL functions should come from the context, not the desktop GL lib, when
Qt is configured for OpenGL ES 2 (e.g. ANGLE).
Change-Id: I794e1d5989ac72d2e98070d20e91f9c2c4cb7183
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/opengl/qopengltexturehelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopengltexturehelper.cpp b/src/gui/opengl/qopengltexturehelper.cpp index 7cd7ca54b2..676c0802de 100644 --- a/src/gui/opengl/qopengltexturehelper.cpp +++ b/src/gui/opengl/qopengltexturehelper.cpp @@ -148,7 +148,7 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context) } #endif -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) && !defined(QT_OPENGL_ES_2) HMODULE handle = GetModuleHandleA("opengl32.dll"); // OpenGL 1.0 |