diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-10 22:00:11 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-10 22:00:11 (GMT) |
| commit | fd570dca1319cd92daf0f73b10ea4e090ea15c23 (patch) | |
| tree | 9de1035b83cd857340e30e82e781f80cd1abc6ef /src/gui/egl | |
| parent | 99e4ba7cb0700eb1a68d6db9fa8d058ddb59f233 (diff) | |
| parent | 3dc18b19ee2a02b93cc509a9162bf0a3900c6fd0 (diff) | |
| download | Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.zip Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.tar.gz Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/egl')
| -rw-r--r-- | src/gui/egl/qeglcontext_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/egl/qeglcontext_p.h b/src/gui/egl/qeglcontext_p.h index cae8164..5bc8f09 100644 --- a/src/gui/egl/qeglcontext_p.h +++ b/src/gui/egl/qeglcontext_p.h @@ -107,6 +107,9 @@ private: static QEglContext *currentContext(QEgl::API api); static void setCurrentContext(QEgl::API api, QEglContext *context); + + friend class QMeeGoGraphicsSystem; + friend class QMeeGoPixmapData; }; QT_END_NAMESPACE |