From 36e9e08dcc5a09b23d9231ed7b6c25ceff9eb4d0 Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Thu, 21 Nov 2013 19:38:28 +0200
Subject: QOpenGLTextureHelper (Windows): Don't load desktop DLL when GLES2 is
 used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/gui/opengl/qopengltexturehelper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/opengl/qopengltexturehelper.cpp')

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
-- 
cgit v1.2.3