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/qglframebufferobject.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/qglframebufferobject.h')
| -rw-r--r-- | src/opengl/qglframebufferobject.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index 6c1c0be..6efbb73 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -130,7 +130,8 @@ protected: private: Q_DISABLE_COPY(QGLFramebufferObject) QScopedPointer<QGLFramebufferObjectPrivate> d_ptr; - friend class QGLDrawable; + friend class QGLPaintDevice; + friend class QGLFBOGLPaintDevice; }; class QGLFramebufferObjectFormatPrivate; @@ -159,6 +160,9 @@ public: void setInternalTextureFormat(QMacCompatGLenum internalTextureFormat); #endif + bool operator==(const QGLFramebufferObjectFormat& other) const; + bool operator!=(const QGLFramebufferObjectFormat& other) const; + private: QGLFramebufferObjectFormatPrivate *d; |