From f46787b48a4452cc19ed4201cfc8cac7b7cddcfe Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Thu, 4 Apr 2013 09:37:46 +0100
Subject: Bring glgen into line with OpenGL functions and extensions code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This ensures that glgen outputs exactly what is included in

src/gui/opengl/qopenglversionfunctions.*
src/gui/opengl/qopenglfunctions_*
src/openglextensions/*

Change-Id: I7d41d9fc2bf6e5fedf11f58872c079339dac3649
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
 util/glgen/qopenglversionfunctions__VERSION__.h.header | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'util/glgen/qopenglversionfunctions__VERSION__.h.header')

diff --git a/util/glgen/qopenglversionfunctions__VERSION__.h.header b/util/glgen/qopenglversionfunctions__VERSION__.h.header
index b3d097c2f9..4b30dc1b65 100644
--- a/util/glgen/qopenglversionfunctions__VERSION__.h.header
+++ b/util/glgen/qopenglversionfunctions__VERSION__.h.header
@@ -51,7 +51,9 @@
 #ifndef QOPENGLVERSIONFUNCTIONS__VERSION___H
 #define QOPENGLVERSIONFUNCTIONS__VERSION___H
 
-#ifndef QT_NO_OPENGL
+#include <QtCore/qglobal.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
 #include <QtGui/QOpenGLVersionFunctions>
 #include <QtGui/qopenglcontext.h>
-- 
cgit v1.2.3