diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-07 00:12:56 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-07 00:12:56 (GMT) |
| commit | 4ef710944991e1c3ec448b3525376f5cefe310a2 (patch) | |
| tree | 2e6a19f9f71b979b81a261cbf64f7594192504cd /src/opengl/qgl_p.h | |
| parent | 01cd0bdf7e08f537b1e9b46e70653761145f8720 (diff) | |
| parent | 71a328397720af7229fd6ee48acaa19f7339a8de (diff) | |
| download | Qt-4ef710944991e1c3ec448b3525376f5cefe310a2.zip Qt-4ef710944991e1c3ec448b3525376f5cefe310a2.tar.gz Qt-4ef710944991e1c3ec448b3525376f5cefe310a2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index dc1e26e..1f28b08 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -361,7 +361,7 @@ public: quint32 gpm; int screen; QHash<QPixmapData*, QPixmap> boundPixmaps; - QGLTexture *bindTextureFromNativePixmap(QPixmapData*, const qint64 key, + QGLTexture *bindTextureFromNativePixmap(QPixmap*, const qint64 key, QGLContext::BindOptions options); static void destroyGlSurfaceForPixmap(QPixmapData*); static void unbindPixmapFromTexture(QPixmapData*); |