diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 14:33:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-14 14:38:15 +0200 |
| commit | 31d089186682d9149ab6350bfd5baab5290a4c00 (patch) | |
| tree | 928523fd469d76090bc88c3d42f10c6ec33311e0 /src/gui | |
| parent | 1cc54642368cfdb1f4dac42afef10b12a825f851 (diff) | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/gui')
| -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 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; |