1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 55d07e78da..87f811cbbc 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -110,6 +110,7 @@ private slots:
     void assignLiteralToVariant();
     void assignLiteralToVar();
     void assignLiteralToJSValue();
+    void assignNullStrings();
     void bindJSValueToVar();
     void bindJSValueToVariant();
     void bindJSValueToType();
@@ -873,6 +874,19 @@ void tst_qqmllanguage::assignLiteralToJSValue()
     }
 }
 
+void tst_qqmllanguage::assignNullStrings()
+{
+    QQmlComponent component(&engine, testFileUrl("assignNullStrings.qml"));
+    VERIFY_ERRORS(0);
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+    QVERIFY(object->stringProperty().isNull());
+    QVERIFY(object->byteArrayProperty().isNull());
+    QMetaObject::invokeMethod(object, "assignNullStringsFromJs", Qt::DirectConnection);
+    QVERIFY(object->stringProperty().isNull());
+    QVERIFY(object->byteArrayProperty().isNull());
+}
+
 void tst_qqmllanguage::bindJSValueToVar()
 {
     QQmlComponent component(&engine, testFileUrl("assignLiteralToJSValue.qml"));