diff options
author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-09 01:16:30 (GMT) |
---|---|---|
committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-09 01:16:30 (GMT) |
commit | c5be02430eda5a555114ef332a389b7621904b17 (patch) | |
tree | a428a79a5618a95de48f22bb4b40a8dbdb8816ae /src/opengl/qglpixelbuffer.h | |
parent | 693695e5677422625d555943586d41fbd9dbe971 (diff) | |
parent | 03050f1495a9071a7123ed70caff83466df8c6e5 (diff) | |
download | Qt-c5be02430eda5a555114ef332a389b7621904b17.zip Qt-c5be02430eda5a555114ef332a389b7621904b17.tar.gz Qt-c5be02430eda5a555114ef332a389b7621904b17.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/qglpixelbuffer.h')
-rw-r--r-- | src/opengl/qglpixelbuffer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h index 5e81ea3..fe313a6 100644 --- a/src/opengl/qglpixelbuffer.h +++ b/src/opengl/qglpixelbuffer.h @@ -110,6 +110,8 @@ private: QScopedPointer<QGLPixelBufferPrivate> d_ptr; friend class QGLDrawable; friend class QGLWindowSurface; + friend class QGLPaintDevice; + friend class QGLPBufferGLPaintDevice; }; QT_END_NAMESPACE |