diff options
| author | Tobias Koenig <tokoe@kde.org> | 2009-06-10 15:11:59 (GMT) |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2009-06-10 15:11:59 (GMT) |
| commit | f1e6e89f7ee452af0e4404af537f5fed2a2b2dc5 (patch) | |
| tree | 045fbf67a4806e4e217ef23cdf4f363ac359bef1 /src/opengl/qglframebufferobject.cpp | |
| parent | 5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd (diff) | |
| parent | 5b24c5793607c809b1bac82c7cc3696001ee9217 (diff) | |
| download | Qt-f1e6e89f7ee452af0e4404af537f5fed2a2b2dc5.zip Qt-f1e6e89f7ee452af0e4404af537f5fed2a2b2dc5.tar.gz Qt-f1e6e89f7ee452af0e4404af537f5fed2a2b2dc5.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'src/opengl/qglframebufferobject.cpp')
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index 3e7ca0a..fb16107 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -43,7 +43,9 @@ #include <qdebug.h> #include <private/qgl_p.h> +#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) #include <private/qpaintengineex_opengl2_p.h> +#endif #ifndef QT_OPENGL_ES_2 #include <private/qpaintengine_opengl_p.h> |