Expose HSV and HSL color values to QML

[ChangeLog][QtQuick] Added properties to access color values for the HSV
and HSL color models to the basic QML color type.

Task-number: QTBUG-48723
Change-Id: I45fa52f9f3878553e1b3d0a34b47804ede7794f8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4 files changed, 55 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlvaluetypes/data/color_read.qml b/tests/auto/qml/qqmlvaluetypes/data/color_read.qml
index bc92b1e5f9..73d2b921a7 100644
--- a/tests/auto/qml/qqmlvaluetypes/data/color_read.qml
+++ b/tests/auto/qml/qqmlvaluetypes/data/color_read.qml
@@ -5,5 +5,11 @@ MyTypeObject {
     property real v_g: color.g
     property real v_b: color.b
     property real v_a: color.a
+    property real hsv_h: color.hsvHue
+    property real hsv_s: color.hsvSaturation
+    property real hsv_v: color.hsvValue
+    property real hsl_h: color.hslHue
+    property real hsl_s: color.hslSaturation
+    property real hsl_l: color.hslLightness
     property variant copy: color
 }
diff --git a/tests/auto/qml/qqmlvaluetypes/data/color_write_HSL.qml b/tests/auto/qml/qqmlvaluetypes/data/color_write_HSL.qml
new file mode 100644
index 0000000000..0034163bbe
--- /dev/null
+++ b/tests/auto/qml/qqmlvaluetypes/data/color_write_HSL.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+
+MyTypeObject {
+    color.hslHue: if (true) 0.43
+    color.hslSaturation: if (true) 0.74
+    color.hslLightness: if (true) 0.54
+    color.a: if (true) 0.7
+}
diff --git a/tests/auto/qml/qqmlvaluetypes/data/color_write_HSV.qml b/tests/auto/qml/qqmlvaluetypes/data/color_write_HSV.qml
new file mode 100644
index 0000000000..1fc47d460e
--- /dev/null
+++ b/tests/auto/qml/qqmlvaluetypes/data/color_write_HSV.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+
+MyTypeObject {
+    color.hsvHue: if (true) 0.43
+    color.hsvSaturation: if (true) 0.77
+    color.hsvValue: if (true) 0.88
+    color.a: if (true) 0.7
+}
diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
index f506d0f53a..803bad197a 100644
--- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
+++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
@@ -907,6 +907,15 @@ void tst_qqmlvaluetypes::color()
         QCOMPARE((float)object->property("v_g").toDouble(), (float)0.88);
         QCOMPARE((float)object->property("v_b").toDouble(), (float)0.6);
         QCOMPARE((float)object->property("v_a").toDouble(), (float)0.34);
+
+        QCOMPARE(qRound(object->property("hsv_h").toDouble() * 100), 43);
+        QCOMPARE(qRound(object->property("hsv_s").toDouble() * 100), 77);
+        QCOMPARE(qRound(object->property("hsv_v").toDouble() * 100), 88);
+
+        QCOMPARE(qRound(object->property("hsl_h").toDouble() * 100), 43);
+        QCOMPARE(qRound(object->property("hsl_s").toDouble() * 100), 74);
+        QCOMPARE(qRound(object->property("hsl_l").toDouble() * 100), 54);
+
         QColor comparison;
         comparison.setRedF(0.2);
         comparison.setGreenF(0.88);
@@ -933,6 +942,30 @@ void tst_qqmlvaluetypes::color()
     }
 
     {
+        QQmlComponent component(&engine, testFileUrl("color_write_HSV.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QColor newColor;
+        newColor.setHsvF(0.43, 0.77, 0.88, 0.7);
+        QCOMPARE(object->color(), newColor);
+
+        delete object;
+    }
+
+    {
+        QQmlComponent component(&engine, testFileUrl("color_write_HSL.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QColor newColor;
+        newColor.setHslF(0.43, 0.74, 0.54, 0.7);
+        QCOMPARE(object->color(), newColor);
+
+        delete object;
+    }
+
+    {
         QQmlComponent component(&engine, testFileUrl("color_compare.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);