summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-01-28 14:33:59 (GMT)
committeraavit <qt-info@nokia.com>2011-01-28 14:33:59 (GMT)
commit4a6279a10bbc03acea8c923713c583f14df1746d (patch)
tree7240dbfd94b01bcfd9cd20613d9f43c075a8e84e /src/gui
parentaac8c2678867ae86af846a2644e37b3d1436406a (diff)
parentaa8c77e0ad915e9505675adb9294403fc4f3ea4f (diff)
downloadQt-4a6279a10bbc03acea8c923713c583f14df1746d.zip
Qt-4a6279a10bbc03acea8c923713c583f14df1746d.tar.gz
Qt-4a6279a10bbc03acea8c923713c583f14df1746d.tar.bz2
Merge remote branch 'qt-fire-review/master'
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qcolor.cpp2
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