diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-14 10:23:42 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-14 10:23:42 (GMT) |
| commit | b56444d86aa449e2da15d9b9fd08001f09ac9b25 (patch) | |
| tree | 171f6c0be5cc1c2935f15757630c8583bf0b2dd9 /src/opengl/qwindowsurface_gl_p.h | |
| parent | 5f68933c9adbf2dc1d6150d5771c8443395d6780 (diff) | |
| parent | 662174b78b7e08c759d0086e215e81e9e0eaf0c5 (diff) | |
| download | Qt-b56444d86aa449e2da15d9b9fd08001f09ac9b25.zip Qt-b56444d86aa449e2da15d9b9fd08001f09ac9b25.tar.gz Qt-b56444d86aa449e2da15d9b9fd08001f09ac9b25.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into lighthouse-master
Diffstat (limited to 'src/opengl/qwindowsurface_gl_p.h')
| -rw-r--r-- | src/opengl/qwindowsurface_gl_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h index a8d8381..c71ce59 100644 --- a/src/opengl/qwindowsurface_gl_p.h +++ b/src/opengl/qwindowsurface_gl_p.h @@ -104,6 +104,8 @@ public: QImage *buffer(const QWidget *widget); + WindowSurfaceFeatures features() const; + QGLContext *context() const; static QGLFormat surfaceFormat; |