diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-28 23:54:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-28 23:54:01 (GMT) |
| commit | b9b86271b272c710817f0fad89a79c40181bdcff (patch) | |
| tree | 9f82baf802f1c6cb8d2308095f91afeec9064a71 /src/gui | |
| parent | 27d49af44951b52ca82afb3258ce93584a89d98f (diff) | |
| parent | 4a6279a10bbc03acea8c923713c583f14df1746d (diff) | |
| download | Qt-b9b86271b272c710817f0fad89a79c40181bdcff.zip Qt-b9b86271b272c710817f0fad89a79c40181bdcff.tar.gz Qt-b9b86271b272c710817f0fad89a79c40181bdcff.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index dea3a72..173fb71 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -1781,7 +1781,7 @@ QColor QColor::toHsl() const color.ct.ahsl.lightness = qRound(lightness * USHRT_MAX); if (qFuzzyIsNull(delta)) { // achromatic case, hue is undefined - color.ct.ahsl.hue = 0; + color.ct.ahsl.hue = USHRT_MAX; color.ct.ahsl.saturation = 0; } else { // chromatic case |