diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 11:42:54 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 11:42:54 (GMT) |
| commit | 3286c4d489905d27183a9ba18048c11a5af8913c (patch) | |
| tree | 392cc7137ffd69b305272f672db55a73be4f1dae /src/gui/painting/qpaintdevice.qdoc | |
| parent | 1bc1e5c0b76a92594c5254e72d25165879e753d2 (diff) | |
| parent | 6b651e5f69b656c6c6fa05b6a81674a4fd56a160 (diff) | |
| download | Qt-3286c4d489905d27183a9ba18048c11a5af8913c.zip Qt-3286c4d489905d27183a9ba18048c11a5af8913c.tar.gz Qt-3286c4d489905d27183a9ba18048c11a5af8913c.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/gui/painting/qpaintdevice.qdoc')
| -rw-r--r-- | src/gui/painting/qpaintdevice.qdoc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc index dca7e0e..6c0b04c 100644 --- a/src/gui/painting/qpaintdevice.qdoc +++ b/src/gui/painting/qpaintdevice.qdoc @@ -221,6 +221,18 @@ /*! \fn int QPaintDevice::numColors() const + \deprecated + + Use colorCount() instead. + + Returns the number of different colors available for the paint + device. Since this value is an int, it will not be sufficient to represent + the number of colors on 32 bit displays, in this case INT_MAX is + returned instead. +*/ + +/*! + \fn int QPaintDevice::colorCount() const Returns the number of different colors available for the paint device. Since this value is an int, it will not be sufficient to represent |