diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-02 15:07:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 16:26:21 +0200 |
commit | 0a3eb0fe443f8158d81d97cde8f0c9a9632fb9f0 (patch) | |
tree | 7bbdc72a7e30e23fc66a610ff7e3cd298711e5b1 /src/gui/opengl/qopenglfunctions_es2.h | |
parent | cee7380c0470dc591e2aafb3225641d4194ab05c (diff) | |
parent | 190fa97c83472863fd886e86f626ab8196ed51b3 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/opengl/qopenglfunctions_es2.h')
-rw-r--r-- | src/gui/opengl/qopenglfunctions_es2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglfunctions_es2.h b/src/gui/opengl/qopenglfunctions_es2.h index 9c14567723..21ed6bec93 100644 --- a/src/gui/opengl/qopenglfunctions_es2.h +++ b/src/gui/opengl/qopenglfunctions_es2.h @@ -44,7 +44,7 @@ #include <QtCore/qglobal.h> -#if defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) || defined(Q_QDOC) #include <QtGui/QOpenGLVersionFunctions> #include <QtGui/qopenglcontext.h> |