Ensure raster pixmap cache key is the same as that of pixmap.toImage()
authorMichael Brasser <michael.brasser@live.com>
Sat, 8 Dec 2012 04:15:49 +0000 (22:15 -0600)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 11 Jan 2013 20:24:23 +0000 (21:24 +0100)
commitf156e578d7f4b05f44a6e84b2173f1e69b856442
tree9e47c7d240bc52236391c3e51c4b6c6f71124209
parent9fa5191b6eca7fc96b4720d9b892b0e2a8ff1469
Ensure raster pixmap cache key is the same as that of pixmap.toImage()

This is done to support texture uploads in an image provider. It ensures
we can load the texture using QImage in the image provider, and when
it is later painted as a pixmap, the cacheKey will be identical
(assuming no format conversion was required).

Change-Id: I54229511ed91ce5430cc478af5aff0d96685a2da
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
src/gui/image/qpixmap_raster.cpp
src/gui/image/qplatformpixmap.cpp
src/gui/image/qplatformpixmap.h
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp