diff options
| author | Espen Riskedal <espenr@trolltech.com> | 2009-08-21 12:54:20 (GMT) |
|---|---|---|
| committer | Espen Riskedal <espenr@trolltech.com> | 2009-08-21 12:54:20 (GMT) |
| commit | 871fda3be4028811de9e295143d32cf1c8c281b6 (patch) | |
| tree | 41cfbf5dc45bb39cdb3b3469a7d165d80465d1ef | |
| parent | df518cf77c9b3a499d26b33890561bd98f50a49b (diff) | |
| parent | 8da4e2947410534e6245765f17c6b803cb4b1089 (diff) | |
| download | Qt-871fda3be4028811de9e295143d32cf1c8c281b6.zip Qt-871fda3be4028811de9e295143d32cf1c8c281b6.tar.gz Qt-871fda3be4028811de9e295143d32cf1c8c281b6.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -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); |