projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b8f6ad4)
QtGui: Fix a crash in OpenGL on Windows.
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Tue, 29 Nov 2011 08:59:26 +0000 (09:59 +0100)
committerQt by Nokia <qt-info@nokia.com>
Tue, 29 Nov 2011 11:27:38 +0000 (12:27 +0100)
Add missing WINAPI calling convention for QOpenGLFunctions.

Change-Id: I43827d801c5ecc3859d8d4ba0bb9bccc108880e7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
src/gui/opengl/qopenglfunctions.h patch | blob | history

diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index 7851842..7d9e347 100644 (file)
--- 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 *
Domain: UI Framework / Uncategorized;