diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-22 07:31:32 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-27 10:49:11 (GMT) |
| commit | 9c0502356c6e1179d895ed53e890c2eecb20e12e (patch) | |
| tree | 72b2f71dddf2bcd5acfed420f0b8d550d2f0d477 | |
| parent | e9153669f435348e8d4c92b68ad67831f5639bfd (diff) | |
| download | Qt-9c0502356c6e1179d895ed53e890c2eecb20e12e.zip Qt-9c0502356c6e1179d895ed53e890c2eecb20e12e.tar.gz Qt-9c0502356c6e1179d895ed53e890c2eecb20e12e.tar.bz2 | |
Fix documentation bug in QColor
(cherry picked from commit 03c77ad02d5a3c69f4edfdfd2f3ef7cd7dc67aaa)
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index f51dc36..d6d288e 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -934,8 +934,7 @@ void QColor::setRgb(int r, int g, int b, int a) /*! \fn QRgb QColor::rgba() const - Returns the RGB value of the color. Unlike rgb(), the alpha is not - stripped. + Returns the RGB value of the color, including its alpha. For an invalid color, the alpha value of the returned color is unspecified. @@ -950,8 +949,7 @@ QRgb QColor::rgba() const } /*! - Sets the RGBA value to \a rgba. Unlike setRgb(QRgb rgb), this function does - not ignore the alpha. + Sets the RGB value to \a rgba, including its alpha. \sa rgba(), rgb() */ @@ -968,8 +966,7 @@ void QColor::setRgba(QRgb rgba) /*! \fn QRgb QColor::rgb() const - Returns the RGB value of the color. The alpha is stripped for - compatibility. + Returns the RGB value of the color. The alpha value is opaque. \sa getRgb(), rgba() */ @@ -983,7 +980,7 @@ QRgb QColor::rgb() const /*! \overload - Sets the RGB value to \a rgb, ignoring the alpha. + Sets the RGB value to \a rgb. The alpha value is set to opaque. */ void QColor::setRgb(QRgb rgb) { |