diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-29 14:15:03 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-29 14:22:33 (GMT) |
| commit | ef85c1a7a5409f58f3212845df7dec63e2fb411f (patch) | |
| tree | 6b75f09a84652c86d66cd2dd0161d1ad240032d4 | |
| parent | f5592ef682ce18e7e6fd3770de722a5255a34ef7 (diff) | |
| download | Qt-ef85c1a7a5409f58f3212845df7dec63e2fb411f.zip Qt-ef85c1a7a5409f58f3212845df7dec63e2fb411f.tar.gz Qt-ef85c1a7a5409f58f3212845df7dec63e2fb411f.tar.bz2 | |
Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.
This causes linker errors since qwindowsurface.cpp isn't compiled.
Task-number: QTBUG-14217
Reviewed-by: Eskil Abrahamsen Blomfeldt
| -rw-r--r-- | src/opengl/qgl.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qglpaintdevice.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index ded7aa8..b755153 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -69,6 +69,7 @@ #if !defined(QT_OPENGL_ES_1) #include "gl2paintengineex/qpaintengineex_opengl2_p.h" +#include <private/qwindowsurface_gl_p.h> #endif #ifndef QT_OPENGL_ES_2 @@ -86,7 +87,6 @@ #include <private/qpixmapdata_p.h> #include <private/qpixmapdata_gl_p.h> #include <private/qglpixelbuffer_p.h> -#include <private/qwindowsurface_gl_p.h> #include <private/qimagepixmapcleanuphooks_p.h> #include "qcolormap.h" #include "qfile.h" diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp index ae61ca1..0e879df 100644 --- a/src/opengl/qglpaintdevice.cpp +++ b/src/opengl/qglpaintdevice.cpp @@ -43,13 +43,13 @@ #include <private/qgl_p.h> #include <private/qglpixelbuffer_p.h> #include <private/qglframebufferobject_p.h> -#include <private/qwindowsurface_gl_p.h> #ifdef Q_WS_X11 #include <private/qpixmapdata_x11gl_p.h> #endif #if !defined(QT_OPENGL_ES_1) #include <private/qpixmapdata_gl_p.h> +#include <private/qwindowsurface_gl_p.h> #endif QT_BEGIN_NAMESPACE |