diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 12:58:30 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 12:58:30 (GMT) |
| commit | ab1df6dea670a60bfef5efd81d6687f9534cfc5d (patch) | |
| tree | b029581e60ccbb7fcedde042ec1d4e382318e0fc /src | |
| parent | e59ee48a8656d04339967ad99334bd0ddca0c956 (diff) | |
| parent | 871fda3be4028811de9e295143d32cf1c8c281b6 (diff) | |
| download | Qt-ab1df6dea670a60bfef5efd81d6687f9534cfc5d.zip Qt-ab1df6dea670a60bfef5efd81d6687f9534cfc5d.tar.gz Qt-ab1df6dea670a60bfef5efd81d6687f9534cfc5d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 70a35b2..57ef70c 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1494,7 +1494,7 @@ void QGLTextureCache::pixmapCleanupHook(QPixmap* pixmap) instance()->remove(cacheKey); } #if defined(Q_WS_X11) - QPixmapData *pd = pixmap->data_ptr(); + QPixmapData *pd = pixmap->data_ptr().data(); // Only need to delete the gl surface if the pixmap is about to be deleted if (pd->ref == 0) QGLContextPrivate::destroyGlSurfaceForPixmap(pd); |