diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-02-23 17:45:41 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-02-23 17:45:41 (GMT) |
| commit | 615972e09981a0916422716b4f6572c6401789da (patch) | |
| tree | 82203c15bceebd5426c823852ef5c85ad025e92b /src/gui/image/qpixmapdata_p.h | |
| parent | 60fd302e8d88b92ade59d68872c99310128c3a6c (diff) | |
| parent | de4332a4728e739b37e9c7b04c021e150e096270 (diff) | |
| download | Qt-615972e09981a0916422716b4f6572c6401789da.zip Qt-615972e09981a0916422716b4f6572c6401789da.tar.gz Qt-615972e09981a0916422716b4f6572c6401789da.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
| -rw-r--r-- | src/gui/image/qpixmapdata_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 1125515..827fa18 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -117,6 +117,14 @@ public: inline int colorCount() const { return metric(QPaintDevice::PdmNumColors); } inline int depth() const { return d; } inline bool isNull() const { return is_null; } + inline qint64 cacheKey() const { + int classKey = id; + if (classKey >= 1024) + classKey = -(classKey >> 10); + return ((((qint64) classKey) << 56) + | (((qint64) ser_no) << 32) + | ((qint64) detach_no)); + } #if defined(Q_OS_SYMBIAN) virtual void* toNativeType(NativeType type); |