diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 12:57:21 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 12:57:21 (GMT) |
| commit | 3e301a89f613a2304392236085e593ad765d741a (patch) | |
| tree | bd5358d5f729d47048ab49f4ca8b39f12a163184 /src/opengl | |
| parent | 34679dd23213881a9632e21e4858377ff90a9006 (diff) | |
| parent | 871fda3be4028811de9e295143d32cf1c8c281b6 (diff) | |
| download | Qt-3e301a89f613a2304392236085e593ad765d741a.zip Qt-3e301a89f613a2304392236085e593ad765d741a.tar.gz Qt-3e301a89f613a2304392236085e593ad765d741a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/opengl')
| -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 f2a14d6..f5905ec 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1495,7 +1495,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); |