diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 15:41:47 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 15:42:22 +0200 |
| commit | 90297a64f203959f90041887ea31f4bd04bc059a (patch) | |
| tree | 86f8ad6a5af26fd618cdb2e20601e6df89ac94d6 /util/glgen/qopenglversionfunctions__VERSION__.h.header | |
| parent | 537a4bc4011d32de193dc31caf09a44c1810ab33 (diff) | |
| parent | f273d6fbc02055ff3999adc0df76360ca0670435 (diff) | |
Merge branch 'stable' into dev
Change-Id: Icff019d74ae04c628a80f66aa478e4db40fae464
Diffstat (limited to 'util/glgen/qopenglversionfunctions__VERSION__.h.header')
| -rw-r--r-- | util/glgen/qopenglversionfunctions__VERSION__.h.header | 4 |
1 files changed, 3 insertions, 1 deletions
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> |