v4: Enable primitive conversation to QQmlScriptString in javascript

This makes following QML-code proper working:

ParentChange {
  x: 0
  Component.onCompleted: x = 10
}

where x is a QQmlScriptString.

Before this patch an error-message would be thrown that the
bool/int/string/etc cannot be converted to a QQmlScriptString.

With the patch primitive types including null and undefined are
proper converted to a QQmlScriptString. The patch ignores (as
in not implements) function/binding assignment.

Unfortunately since commit aa25ad8d5f4 its not possible any
longer to instanciate QQmlScriptString what means there is
otherwise no (easy) way to inject a QQmlScriptString from
within Javascript.

Change-Id: I18aac6a6e9a57f3b7d0a2d66cdab2be6c3c153c5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

2 files changed, 84 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/data/scriptStringJs.qml b/tests/auto/qml/qqmllanguage/data/scriptStringJs.qml
new file mode 100644
index 0000000000..bf6a8b9fbd
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/scriptStringJs.qml
@@ -0,0 +1,5 @@
+import Test 1.0
+
+MyTypeObject {
+    scriptProperty: " hello \" world "
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index bba558d85e..adf3f09c37 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -146,6 +146,7 @@ private slots:
     void onCompleted();
     void onDestruction();
     void scriptString();
+    void scriptStringJs();
     void scriptStringWithoutSourceCode();
     void defaultPropertyListOrder();
     void declaredPropertyValues();
@@ -1946,6 +1947,84 @@ void tst_qqmllanguage::scriptString()
     }
 }
 
+// Check that assignments to QQmlScriptString properties works also from within Javascript
+void tst_qqmllanguage::scriptStringJs()
+{
+    QQmlComponent component(&engine, testFileUrl("scriptStringJs.qml"));
+    VERIFY_ERRORS(0);
+
+    MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
+    QVERIFY(object != 0);
+    QQmlContext *context = QQmlEngine::contextForObject(object);
+    QVERIFY(context != 0);
+    bool ok;
+
+    QCOMPARE(QQmlScriptStringPrivate::get(object->scriptProperty())->script, QString("\" hello \\\" world \""));
+    QVERIFY(!object->scriptProperty().isEmpty());
+    QVERIFY(!object->scriptProperty().isUndefinedLiteral());
+    QVERIFY(!object->scriptProperty().isNullLiteral());
+    QCOMPARE(object->scriptProperty().stringLiteral(), QString(" hello \\\" world "));
+    QVERIFY(object->scriptProperty().numberLiteral(&ok) == 0.0 && !ok);
+    QVERIFY(!object->scriptProperty().booleanLiteral(&ok) && !ok);
+
+    QJSValue inst = engine.newQObject(object);
+    QJSValue func = engine.evaluate("function(value) { this.scriptProperty = value }");
+
+    func.callWithInstance(inst, QJSValueList() << "test a \"string ");
+    QCOMPARE(QQmlScriptStringPrivate::get(object->scriptProperty())->script, QString("\"test a \\\"string \""));
+    QVERIFY(!object->scriptProperty().isEmpty());
+    QVERIFY(!object->scriptProperty().isUndefinedLiteral());
+    QVERIFY(!object->scriptProperty().isNullLiteral());
+    QCOMPARE(object->scriptProperty().stringLiteral(), QString("test a \\\"string "));
+    QVERIFY(object->scriptProperty().numberLiteral(&ok) == 0.0 && !ok);
+    QVERIFY(!object->scriptProperty().booleanLiteral(&ok) && !ok);
+
+    func.callWithInstance(inst, QJSValueList() << QJSValue::UndefinedValue);
+    QCOMPARE(QQmlScriptStringPrivate::get(object->scriptProperty())->script, QString("undefined"));
+    QVERIFY(!object->scriptProperty().isEmpty());
+    QVERIFY(object->scriptProperty().isUndefinedLiteral());
+    QVERIFY(!object->scriptProperty().isNullLiteral());
+    QVERIFY(object->scriptProperty().stringLiteral().isEmpty());
+    QVERIFY(object->scriptProperty().numberLiteral(&ok) == 0.0 && !ok);
+    QVERIFY(!object->scriptProperty().booleanLiteral(&ok) && !ok);
+
+    func.callWithInstance(inst, QJSValueList() << true);
+    QCOMPARE(QQmlScriptStringPrivate::get(object->scriptProperty())->script, QString("true"));
+    QVERIFY(!object->scriptProperty().isEmpty());
+    QVERIFY(!object->scriptProperty().isUndefinedLiteral());
+    QVERIFY(!object->scriptProperty().isNullLiteral());
+    QVERIFY(object->scriptProperty().stringLiteral().isEmpty());
+    QVERIFY(object->scriptProperty().numberLiteral(&ok) == 0.0 && !ok);
+    QVERIFY(object->scriptProperty().booleanLiteral(&ok) && ok);
+
+    func.callWithInstance(inst, QJSValueList() << false);
+    QCOMPARE(QQmlScriptStringPrivate::get(object->scriptProperty())->script, QString("false"));
+    QVERIFY(!object->scriptProperty().isEmpty());
+    QVERIFY(!object->scriptProperty().isUndefinedLiteral());
+    QVERIFY(!object->scriptProperty().isNullLiteral());
+    QVERIFY(object->scriptProperty().stringLiteral().isEmpty());
+    QVERIFY(object->scriptProperty().numberLiteral(&ok) == 0.0 && !ok);
+    QVERIFY(!object->scriptProperty().booleanLiteral(&ok) && ok);
+
+    func.callWithInstance(inst, QJSValueList() << QJSValue::NullValue);
+    QCOMPARE(QQmlScriptStringPrivate::get(object->scriptProperty())->script, QString("null"));
+    QVERIFY(!object->scriptProperty().isEmpty());
+    QVERIFY(!object->scriptProperty().isUndefinedLiteral());
+    QVERIFY(object->scriptProperty().isNullLiteral());
+    QVERIFY(object->scriptProperty().stringLiteral().isEmpty());
+    QVERIFY(object->scriptProperty().numberLiteral(&ok) == 0.0 && !ok);
+    QVERIFY(!object->scriptProperty().booleanLiteral(&ok) && !ok);
+
+    func.callWithInstance(inst, QJSValueList() << 12.34);
+    QCOMPARE(QQmlScriptStringPrivate::get(object->scriptProperty())->script, QString("12.34"));
+    QVERIFY(!object->scriptProperty().isEmpty());
+    QVERIFY(!object->scriptProperty().isUndefinedLiteral());
+    QVERIFY(!object->scriptProperty().isNullLiteral());
+    QVERIFY(object->scriptProperty().stringLiteral().isEmpty());
+    QVERIFY(object->scriptProperty().numberLiteral(&ok) == 12.34 && ok);
+    QVERIFY(!object->scriptProperty().booleanLiteral(&ok) && !ok);
+}
+
 void tst_qqmllanguage::scriptStringWithoutSourceCode()
 {
     QUrl url = testFileUrl("scriptString7.qml");