diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-10 11:04:29 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-10 11:04:29 +0100 |
| commit | 7651a4bacf8f34f3700853f147093a073f0472ab (patch) | |
| tree | d47559d6b0c6fc78b091095bbd8b8350c880e91b /src/gui/image/qpixmapdata_p.h | |
| parent | 175605f736ce76a9c0296aa607a6a82ea6675542 (diff) | |
| parent | f57a2756ebfb48c2fad94c0c319fa181d2af4dfd (diff) | |
Merge remote branch 'remotes/qt/4.6' into lighthouse
Conflicts:
configure
tests/auto/qwidget/tst_qwidget.cpp
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 bc13c365cd..8323b617b1 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); |