diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-10 23:00:14 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-10 23:00:14 (GMT) |
| commit | ad925d41019d5e5c47143ab91f775f970995ad0d (patch) | |
| tree | ad05cea02ddf9c87b832fc7111bb1b09f5203408 /src/opengl/qgl.h | |
| parent | b7d91c0d798bc10dd4f8a750723285076fb96935 (diff) | |
| parent | 38e1ed3b51d6aad46912eb548490d038e58203d9 (diff) | |
| download | Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.zip Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.tar.gz Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index f85cad5..9ae619d 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -428,6 +428,7 @@ private: friend class QGLSharedResourceGuard; friend class QGLPixmapBlurFilter; friend class QGLExtensions; + friend class QGLTexture; friend QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags(); #ifdef Q_WS_MAC public: |