diff options
| author | Andy Shaw <andy.shaw@nokia.com> | 2009-07-23 07:46:35 (GMT) |
|---|---|---|
| committer | Andy Shaw <andy.shaw@nokia.com> | 2009-07-23 07:46:35 (GMT) |
| commit | ada4f17c1a1187e74c45aca5082a99ee3aba80c5 (patch) | |
| tree | 7a2c9545b1d9607f5e8d77c3353230dc15949aef | |
| parent | a86b11c731d1c9f7fa83ebc8b3fd428e9a8fb3f9 (diff) | |
| parent | a2d64535d011a47cb2bdf91002f9210cf6b656b1 (diff) | |
| download | Qt-ada4f17c1a1187e74c45aca5082a99ee3aba80c5.zip Qt-ada4f17c1a1187e74c45aca5082a99ee3aba80c5.tar.gz Qt-ada4f17c1a1187e74c45aca5082a99ee3aba80c5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | src/opengl/qgl_x11egl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 11131ea..99b026d 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -469,7 +469,7 @@ void QGLWidgetPrivate::recreateEglSurface(bool force) } } -GLuint QGLContextPrivate::bindTextureFromNativePixmap(const QPixmap& pm, const qint64 key, bool canInvert) +QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool canInvert) { // TODO return 0; |