diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 09:58:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 09:58:08 (GMT) |
| commit | 98824c2ebe97f61bf294b0be07ac164aed470fbf (patch) | |
| tree | 0621c3002e2f2fe28fc6e39a14429928cc2aa072 /src/opengl | |
| parent | a3c2f84f1a33610b86a600c68653b96de1d2b9f5 (diff) | |
| parent | e5be06e53a33605a4f5987e9d451b2143470bdf4 (diff) | |
| download | Qt-98824c2ebe97f61bf294b0be07ac164aed470fbf.zip Qt-98824c2ebe97f61bf294b0be07ac164aed470fbf.tar.gz Qt-98824c2ebe97f61bf294b0be07ac164aed470fbf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fall back to Qt for loading images with DICAPS_COLORKEY.
Implement QWidget::metric PdmNumColors for QWS
Adding ::scroll capabilities to live pixmaps.
Major refactoring: creating a new QPixmapData subclass for live textures.
Diffstat (limited to 'src/opengl')
| -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 |