diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-11-11 09:33:57 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-11-11 09:33:57 (GMT) |
| commit | 6855df6110eebdbfc43211f20dd65f446ccda209 (patch) | |
| tree | dd731afb046463a7dcbe249f7ea9de0484195b2a /src/gui/image/qpixmap.h | |
| parent | 835a23891567831cf184e5bbaba8d00bfc912699 (diff) | |
| parent | 95db13345cd7b6b7cac8725fe2879aaf80233818 (diff) | |
| download | Qt-6855df6110eebdbfc43211f20dd65f446ccda209.zip Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.gz Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.bz2 | |
Merge remote branch 'qt/4.6' into kinetic-declarativeui
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; |