diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:33:53 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:42:07 (GMT) |
| commit | fb4903c4eca6a085c4c39078c11de03f5791f08e (patch) | |
| tree | 61bd5dfcd910d3fd61dea891ae530beafb5a1e48 /src/gui/image | |
| parent | 5ee3e4964d60f4d9cd7026c6f8b6fb93ddd39588 (diff) | |
| download | Qt-fb4903c4eca6a085c4c39078c11de03f5791f08e.zip Qt-fb4903c4eca6a085c4c39078c11de03f5791f08e.tar.gz Qt-fb4903c4eca6a085c4c39078c11de03f5791f08e.tar.bz2 | |
Deprecate some QPixmap functions (marked as obsolete already).
Reviewed-by: Olivier Goffart
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 4668913..f5479e7 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -109,8 +109,10 @@ public: QBitmap mask() const; void setMask(const QBitmap &); - QPixmap alphaChannel() const; - void setAlphaChannel(const QPixmap &); +#ifdef QT_DEPRECATED + QT_DEPRECATED QPixmap alphaChannel() const; + QT_DEPRECATED void setAlphaChannel(const QPixmap &); +#endif bool hasAlpha() const; bool hasAlphaChannel() const; @@ -183,7 +185,9 @@ public: inline void scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed = 0); void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = 0); - int serialNumber() const; +#ifdef QT_DEPRECATED + QT_DEPRECATED int serialNumber() const; +#endif qint64 cacheKey() const; bool isDetached() const; |