aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qjsvalue
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qjsvalue')
-rw-r--r--tests/auto/qml/qjsvalue/tst_qjsvalue.cpp17
-rw-r--r--tests/auto/qml/qjsvalue/tst_qjsvalue.h1
2 files changed, 18 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
index fd2eb40717..2b91ca0019 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
@@ -2872,4 +2872,21 @@ void tst_QJSValue::jsFunctionInVariant()
}
}
+void tst_QJSValue::integerToEnum()
+{
+ QJSEngine engine;
+
+ QJSValue enumVal = engine.toScriptValue(QQmlComponent::Error);
+ QJSValue intVal(static_cast<int>(QQmlComponent::Error));
+
+ QVERIFY(enumVal.equals(intVal));
+ QVERIFY(intVal.equals(enumVal));
+
+ QCOMPARE(qjsvalue_cast<QQmlComponent::Status>(intVal), QQmlComponent::Error);
+ QCOMPARE(qjsvalue_cast<QQmlComponent::Status>(enumVal), QQmlComponent::Error);
+
+ QCOMPARE(qjsvalue_cast<int>(intVal), static_cast<int>(QQmlComponent::Error));
+ QCOMPARE(qjsvalue_cast<int>(enumVal), static_cast<int>(QQmlComponent::Error));
+}
+
QTEST_MAIN(tst_QJSValue)
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.h b/tests/auto/qml/qjsvalue/tst_qjsvalue.h
index 0b35b58c58..db6ed4e413 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.h
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.h
@@ -148,6 +148,7 @@ private slots:
void deleteFromDifferentThread();
void stringAndUrl();
void jsFunctionInVariant();
+ void integerToEnum();
private:
void newEngine()