diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-07-30 08:15:46 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-07-30 08:15:46 (GMT) |
| commit | d2820e3a67812d31f45df282b378a75511bb1c4b (patch) | |
| tree | 8ab0213d5250289b30d7e26e50ab85fe3c5c4068 /src/plugins | |
| parent | 9523b27be4fe00870d19c4ff4caa2d78dcf520e6 (diff) | |
| parent | 0ff4c453bf3d549e8344ab18f643f61a8b6174ef (diff) | |
| download | Qt-d2820e3a67812d31f45df282b378a75511bb1c4b.zip Qt-d2820e3a67812d31f45df282b378a75511bb1c4b.tar.gz Qt-d2820e3a67812d31f45df282b378a75511bb1c4b.tar.bz2 | |
Merge branch 'texture_from_pixmap'
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index b264ac0..2ed890b 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -53,6 +53,7 @@ #include <qmath.h> #include <private/qpixmapdata_p.h> #include <private/qpixmap_raster_p.h> +#include <private/qimagepixmapcleanuphooks_p.h> class SurfaceCache; class QDirectFBPaintEnginePrivate : public QRasterPaintEnginePrivate @@ -699,9 +700,7 @@ void QDirectFBPaintEngine::initImageCache(int size) { Q_ASSERT(size >= 0); imageCache.setMaxCost(size); - typedef void (*_qt_image_cleanup_hook_64)(qint64); - extern Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64; - qt_image_cleanup_hook_64 = ::cachedImageCleanupHook; + QImagePixmapCleanupHooks::instance()->addImageHook(cachedImageCleanupHook); } #endif // QT_DIRECTFB_IMAGECACHE |