From 31d089186682d9149ab6350bfd5baab5290a4c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 12 Jul 2011 14:33:53 +0200 Subject: Deprecate some QPixmap functions (marked as obsolete already). Reviewed-by: Olivier Goffart (cherry picked from commit fb4903c4eca6a085c4c39078c11de03f5791f08e) Change-Id: I87208fe830b47412b40044070fbdad4ed3d0af8c Reviewed-on: http://codereview.qt.nokia.com/1551 Reviewed-by: Qt Sanity Bot Reviewed-by: Olivier Goffart --- src/gui/image/qpixmap.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 76c23c8ce2..3012080abb 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; -- cgit v1.2.3