diff options
| author | aavit <qt-info@nokia.com> | 2011-01-28 14:33:59 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-01-28 14:33:59 (GMT) |
| commit | 4a6279a10bbc03acea8c923713c583f14df1746d (patch) | |
| tree | 7240dbfd94b01bcfd9cd20613d9f43c075a8e84e | |
| parent | aac8c2678867ae86af846a2644e37b3d1436406a (diff) | |
| parent | aa8c77e0ad915e9505675adb9294403fc4f3ea4f (diff) | |
| download | Qt-4a6279a10bbc03acea8c923713c583f14df1746d.zip Qt-4a6279a10bbc03acea8c923713c583f14df1746d.tar.gz Qt-4a6279a10bbc03acea8c923713c583f14df1746d.tar.bz2 | |
Merge remote branch 'qt-fire-review/master'
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qcolor/tst_qcolor.cpp | 10 |
2 files changed, 11 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 diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/qcolor/tst_qcolor.cpp index fcd608b..d42c26c 100644 --- a/tests/auto/qcolor/tst_qcolor.cpp +++ b/tests/auto/qcolor/tst_qcolor.cpp @@ -148,6 +148,8 @@ private slots: void specConstructor_data(); void specConstructor(); + void achromaticHslHue(); + #ifdef Q_WS_X11 void allowX11ColorNames(); void setallowX11ColorNames(); @@ -1459,6 +1461,14 @@ void tst_QColor::specConstructor() QCOMPARE(color.spec(), spec); } +void tst_QColor::achromaticHslHue() +{ + QColor color = Qt::black; + + QColor hsl = color.toHsl(); + QCOMPARE(hsl.hslHue(), -1); +} + #ifdef Q_WS_X11 void tst_QColor::allowX11ColorNames() { |