AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate some QPixmap functions (marked as obsolete already).

Browse Source 
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>
This commit is contained in:
Samuel Rødal 2011-07-12 14:33:53 +02:00 committed by Qt by Nokia
parent 1cc5464236
commit 31d0891866
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/image/qpixmap.h
View File

@ -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;