diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:55:34 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:55:34 (GMT) |
| commit | 168524d4f642724fe9063500c0c39ab747f145b6 (patch) | |
| tree | 9c13991d7e1ee6134fc0d99e1a6369c167100f76 /src/gui/image/qpixmap.h | |
| parent | 764f558846b8ee6f115004fc939b890991c40bfa (diff) | |
| parent | becf7dc2b4b7c2609350eb3236f854c1a4a344f5 (diff) | |
| download | Qt-168524d4f642724fe9063500c0c39ab747f145b6.zip Qt-168524d4f642724fe9063500c0c39ab747f145b6.tar.gz Qt-168524d4f642724fe9063500c0c39ab747f145b6.tar.bz2 | |
Merge branch '4.6' of ..\qt-graphics-4.6
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; |