From 602cab9bb2072c5564bbb43c4125e04f98266043 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 29 Nov 2011 09:59:26 +0100 Subject: [PATCH] QtGui: Fix a crash in OpenGL on Windows. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing WINAPI calling convention for QOpenGLFunctions. Change-Id: I43827d801c5ecc3859d8d4ba0bb9bccc108880e7 Reviewed-by: Samuel Rødal --- src/gui/opengl/qopenglfunctions.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 7851842d46..7d9e34740e 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -78,6 +78,10 @@ typedef ptrdiff_t qopengl_GLintptr; typedef ptrdiff_t qopengl_GLsizeiptr; +#if defined(APIENTRY) && !defined(QOPENGLF_APIENTRY) +# define QOPENGLF_APIENTRY APIENTRY +#endif + # ifndef QOPENGLF_APIENTRYP # ifdef QOPENGLF_APIENTRY # define QOPENGLF_APIENTRYP QOPENGLF_APIENTRY *