diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
| commit | e2f66f921594b7be4af4a058c959557489e86879 (patch) | |
| tree | cc44931708b57bd5a761906797c7dee0360d1d6b /src/gui/painting/qcolor.cpp | |
| parent | 933bf178aab88ab5df8a68cbf02611d6d8744b1b (diff) | |
| parent | 754efa57d89c62d1796e01b407e9222e67450f52 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/global/qnamespace.qdoc
src/corelib/io/qwindowspipereader.cpp
src/corelib/io/qwindowspipereader_p.h
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/plugins/platforms/xcb/qxcbconnection.h
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/tools/qmake/tst_qmake.cpp
tests/manual/touch/main.cpp
Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
Diffstat (limited to 'src/gui/painting/qcolor.cpp')
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index b33d7a74fc..f1ceb464c8 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -729,8 +729,8 @@ void QColor::setHsv(int h, int s, int v, int a) saturation, lightness, and alpha-channel (transparency) components of the color's HSL value. - These components can be retrieved individually using the hueHslF(), - saturationHslF(), lightnessF() and alphaF() functions. + These components can be retrieved individually using the hslHueF(), + hslSaturationF(), lightnessF() and alphaF() functions. \sa setHsl() */ @@ -759,8 +759,8 @@ void QColor::getHslF(qreal *h, qreal *s, qreal *l, qreal *a) const saturation, lightness, and alpha-channel (transparency) components of the color's HSL value. - These components can be retrieved individually using the hueHsl(), - saturationHsl(), lightness() and alpha() functions. + These components can be retrieved individually using the hslHue(), + hslSaturation(), lightness() and alpha() functions. \sa setHsl() */ |