diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:41:58 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:42:39 (GMT) |
| commit | 484a6043ef84df3d0d01a19247ea2c89eb8b309f (patch) | |
| tree | 43cbe0e0da00eff1f82a8ac5a641453cb730ce40 /src/gui/painting | |
| parent | 67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6 (diff) | |
| parent | a61adccf96a8ceefbf1150966adda3f6d226ec6d (diff) | |
| download | Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.zip Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.tar.gz Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.tar.bz2 | |
Merge upstream/4.6 into oslo-staging-2
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpaintdevice.qdoc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc index 6c0b04c..ac1c3de 100644 --- a/src/gui/painting/qpaintdevice.qdoc +++ b/src/gui/painting/qpaintdevice.qdoc @@ -83,7 +83,7 @@ inch. The physicalDpiX() and physicalDpiY() functions also return the resolution of the device in dots per inch, but note that if the logical and vertical resolution differ, the corresponding - QPaintEngine must handle the mapping. Finally, the numColors() + QPaintEngine must handle the mapping. Finally, the colorCount() function returns the number of different colors available for the paint device. @@ -111,7 +111,7 @@ also heightMM(). \value PdmNumColors The number of different colors available for - the paint device. See also numColors(). + the paint device. See also colorCount(). \value PdmDepth The bit depth (number of bit planes) of the paint device. See also depth(). @@ -226,18 +226,18 @@ 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. -*/ + 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 - the number of colors on 32 bit displays, in this case INT_MAX is - returned instead. + 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. */ /*! |