diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-11 23:16:18 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-11 23:16:18 (GMT) |
| commit | 1795d7b20eccf20de84c9a688841d818b6a82c08 (patch) | |
| tree | fff169688ab4e5c5be0fc0a673e156b68afd1763 /src/gui/image/qpixmap.h | |
| parent | 3e8791f60bdba5966054f025312d55756f0a17d3 (diff) | |
| parent | 6855df6110eebdbfc43211f20dd65f446ccda209 (diff) | |
| download | Qt-1795d7b20eccf20de84c9a688841d818b6a82c08.zip Qt-1795d7b20eccf20de84c9a688841d818b6a82c08.tar.gz Qt-1795d7b20eccf20de84c9a688841d818b6a82c08.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic 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; |