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 /tests/auto | |
| 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 'tests/auto')
| -rw-r--r-- | tests/auto/qcolor/tst_qcolor.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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() { |