1 files changed, 54 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
index 300f5b90e5..803bad197a 100644
--- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
+++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
@@ -30,6 +30,7 @@
 #include <QQmlEngine>
 #include <QQmlComponent>
 #include <QDebug>
+#include <QJSValueIterator>
 #include <private/qquickvaluetypes_p.h>
 #include <private/qqmlglobal_p.h>
 #include "../../shared/util.h"
@@ -89,6 +90,7 @@ private slots:
     void customValueTypeInQml();
     void gadgetInheritance();
     void toStringConversion();
+    void enumerableProperties();
 
 private:
     QQmlEngine engine;
@@ -905,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);
@@ -931,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);
@@ -1649,6 +1684,25 @@ void tst_qqmlvaluetypes::toStringConversion()
     QCOMPARE(stringConversion.toString(), StringLessGadget_to_QString(g));
 }
 
+void tst_qqmlvaluetypes::enumerableProperties()
+{
+    QJSEngine engine;
+    DerivedGadget g;
+    QJSValue value = engine.toScriptValue(g);
+    QSet<QString> names;
+    QJSValueIterator it(value);
+    while (it.hasNext()) {
+        it.next();
+        const QString name = it.name();
+        QVERIFY(!names.contains(name));
+        names.insert(name);
+    }
+
+    QCOMPARE(names.count(), 2);
+    QVERIFY(names.contains(QStringLiteral("baseProperty")));
+    QVERIFY(names.contains(QStringLiteral("derivedProperty")));
+}
+
 
 QTEST_MAIN(tst_qqmlvaluetypes)