diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-22 22:00:11 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-22 22:00:11 (GMT) |
| commit | 0787890a9a06a0f05c78c7e4d85655fdc1fc9398 (patch) | |
| tree | 824906aa3899243d46e2590a86ccd114259712a5 /src/opengl/qpixmapdata_gl_p.h | |
| parent | 215f46d0a61a2f48d1ccbbc52c3b161fa36c84ec (diff) | |
| parent | db14623485396fd69839e519184b794775b65b01 (diff) | |
| download | Qt-0787890a9a06a0f05c78c7e4d85655fdc1fc9398.zip Qt-0787890a9a06a0f05c78c7e4d85655fdc1fc9398.tar.gz Qt-0787890a9a06a0f05c78c7e4d85655fdc1fc9398.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/opengl/qpixmapdata_gl_p.h')
| -rw-r--r-- | src/opengl/qpixmapdata_gl_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h index f000993..c0b223f 100644 --- a/src/opengl/qpixmapdata_gl_p.h +++ b/src/opengl/qpixmapdata_gl_p.h @@ -169,6 +169,7 @@ private: friend class QGLPixmapGLPaintDevice; friend class QMeeGoPixmapData; + friend class QMeeGoLivePixmapData; }; QT_END_NAMESPACE |