diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:53:10 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:53:42 (GMT) |
commit | 80dfb33cc5fec8fd19e78a959e02588ce58736ee (patch) | |
tree | d9afe6da9127c63409862623b5a4ffa4598e1bf2 /src/gui/image/qpixmap_mac_p.h | |
parent | a73e660fd05bafc402d63d71e811a621e46f452d (diff) | |
parent | 1b14c3d33dea0fe4814f2749c49cf916ca13e012 (diff) | |
download | Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.zip Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.tar.gz Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.tar.bz2 |
Merge oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/gui/image/qpixmap_mac_p.h')
-rw-r--r-- | src/gui/image/qpixmap_mac_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_mac_p.h b/src/gui/image/qpixmap_mac_p.h index a3fb95f..45ab8e2 100644 --- a/src/gui/image/qpixmap_mac_p.h +++ b/src/gui/image/qpixmap_mac_p.h @@ -107,6 +107,7 @@ private: pixelsToFree later on instead of malloc'ing memory. */ quint32 *pixels; + uint pixelsSize; quint32 *pixelsToFree; uint bytesPerRow; QRectF cg_mask_rect; |