diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-09 18:32:04 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-09 18:32:04 (GMT) |
| commit | 81f3b28f2f82b15f9d255ec38abdc5f749b8809c (patch) | |
| tree | 7e41a16587d903498fbb1ca71cd286a9ba156241 /src/gui/image/qpixmap.h | |
| parent | f656909791819b3f033f9ec1bd0de524b92919e2 (diff) | |
| parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
| download | Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.zip Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.tar.gz Qt-81f3b28f2f82b15f9d255ec38abdc5f749b8809c.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.6-platform
Diffstat (limited to 'src/gui/image/qpixmap.h')
| -rw-r--r-- | src/gui/image/qpixmap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index d11bd03..d95b4ee 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -185,7 +185,8 @@ public: const uchar *qwsBits() const; int qwsBytesPerLine() const; QRgb *clut() const; - int numCols() const; + QT_DEPRECATED int numCols() const; + int colorCount() const; #elif defined(Q_WS_MAC) Qt::HANDLE macQDHandle() const; Qt::HANDLE macQDAlphaHandle() const; |