1 files changed, 78 insertions, 13 deletions

diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 26a15d730c..be04ec2bf3 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -84,6 +84,7 @@ private slots:
     void arrayExpressions();
     void contextPropertiesTriggerReeval();
     void objectPropertiesTriggerReeval();
+    void dependenciesWithFunctions();
     void deferredProperties();
     void deferredPropertiesErrors();
     void deferredPropertiesInComponents();
@@ -210,6 +211,7 @@ private slots:
     void dynamicCreationOwnership();
     void regExpBug();
     void nullObjectBinding();
+    void nullObjectInitializer();
     void deletedEngine();
     void libraryScriptAssert();
     void variantsAssignedUndefined();
@@ -881,6 +883,18 @@ void tst_qqmlecmascript::objectPropertiesTriggerReeval()
     }
 }
 
+void tst_qqmlecmascript::dependenciesWithFunctions()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("dependenciesWithFunctions.qml"));
+
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY2(object, qPrintable(component.errorString()));
+    QVERIFY(!object->property("success").toBool());
+    object->setProperty("value", 42);
+    QVERIFY(object->property("success").toBool());
+}
+
 void tst_qqmlecmascript::deferredProperties()
 {
     QQmlComponent component(&engine, testFileUrl("deferredProperties.qml"));
@@ -2318,7 +2332,7 @@ static inline bool evaluate_error(QV8Engine *engine, const QV4::Value &o, const
     QV4::ScopedCallData d(scope, 1);
     d->args[0] = o;
     d->thisObject = engine->global();
-    function->call(d);
+    function->call(scope, d);
     if (scope.engine->hasException) {
         scope.engine->catchException();
         return true;
@@ -2344,16 +2358,15 @@ static inline bool evaluate_value(QV8Engine *engine, const QV4::Value &o,
     if (!function)
         return false;
 
-    QV4::ScopedValue value(scope);
     QV4::ScopedCallData d(scope, 1);
     d->args[0] = o;
     d->thisObject = engine->global();
-    value = function->call(d);
+    function->call(scope, d);
     if (scope.engine->hasException) {
         scope.engine->catchException();
         return false;
     }
-    return QV4::Runtime::strictEqual(value, result);
+    return QV4::Runtime::method_strictEqual(scope.result, result);
 }
 
 static inline QV4::ReturnedValue evaluate(QV8Engine *engine, const QV4::Value &o,
@@ -2377,12 +2390,12 @@ static inline QV4::ReturnedValue evaluate(QV8Engine *engine, const QV4::Value &o
     QV4::ScopedCallData d(scope, 1);
     d->args[0] = o;
     d->thisObject = engine->global();
-    QV4::ScopedValue result(scope, function->call(d));
+    function->call(scope, d);
     if (scope.engine->hasException) {
         scope.engine->catchException();
         return QV4::Encode::undefined();
     }
-    return result->asReturnedValue();
+    return scope.result.asReturnedValue();
 }
 
 #define EVALUATE_ERROR(source) evaluate_error(engine, object, source)
@@ -2946,9 +2959,16 @@ void tst_qqmlecmascript::callQtInvokables()
     QCOMPARE(o->actuals().count(), 0);
 
     o->reset();
-    QV4::ScopedValue ret(scope, EVALUATE("object.method_intQJSValue(123, function() { return \"Hello world!\";})"));
+    QVERIFY(EVALUATE_VALUE("object.method_QByteArray(\"Hello\")", QV4::Primitive::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 29);
+    QCOMPARE(o->actuals().count(), 1);
+    QCOMPARE(qvariant_cast<QByteArray>(o->actuals().at(0)), QByteArray("Hello"));
+
+    o->reset();
+    QV4::ScopedValue ret(scope, EVALUATE("object.method_intQJSValue(123, function() { return \"Hello world!\";})"));
+    QCOMPARE(o->error(), false);
+    QCOMPARE(o->invoked(), 30);
     QVERIFY(ret->isString());
     QCOMPARE(ret->toQStringNoThrow(), QString("Hello world!"));
     QCOMPARE(o->actuals().count(), 2);
@@ -5707,6 +5727,49 @@ void tst_qqmlecmascript::nullObjectBinding()
     delete object;
 }
 
+void tst_qqmlecmascript::nullObjectInitializer()
+{
+    {
+        QQmlComponent component(&engine, testFileUrl("nullObjectInitializer.qml"));
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+
+        QQmlData *ddata = QQmlData::get(obj.data(), /*create*/false);
+        QVERIFY(ddata);
+
+        {
+            const int propertyIndex = obj->metaObject()->indexOfProperty("testProperty");
+            QVERIFY(propertyIndex > 0);
+            QVERIFY(!ddata->hasBindingBit(propertyIndex));
+        }
+
+        QVariant value = obj->property("testProperty");
+        QVERIFY(value.userType() == qMetaTypeId<QObject*>());
+        QVERIFY(!value.value<QObject*>());
+    }
+
+    {
+        QQmlComponent component(&engine, testFileUrl("nullObjectInitializer.2.qml"));
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+
+        QQmlData *ddata = QQmlData::get(obj.data(), /*create*/false);
+        QVERIFY(ddata);
+
+        {
+            const int propertyIndex = obj->metaObject()->indexOfProperty("testProperty");
+            QVERIFY(propertyIndex > 0);
+            QVERIFY(ddata->hasBindingBit(propertyIndex));
+        }
+
+        QVERIFY(obj->property("success").toBool());
+
+        QVariant value = obj->property("testProperty");
+        QVERIFY(value.userType() == qMetaTypeId<QObject*>());
+        QVERIFY(!value.value<QObject*>());
+    }
+}
+
 // Test that bindings don't evaluate once the engine has been destroyed
 void tst_qqmlecmascript::deletedEngine()
 {
@@ -5768,7 +5831,7 @@ void tst_qqmlecmascript::variants()
     QVERIFY(object != 0);
 
     QCOMPARE(object->property("undefinedVariant").type(), QVariant::Invalid);
-    QCOMPARE(int(object->property("nullVariant").type()), int(QMetaType::VoidStar));
+    QCOMPARE(int(object->property("nullVariant").type()), int(QMetaType::Nullptr));
     QCOMPARE(object->property("intVariant").type(), QVariant::Int);
     QCOMPARE(object->property("doubleVariant").type(), QVariant::Double);
 
@@ -7196,14 +7259,16 @@ namespace QV4 {
 
 namespace Heap {
 struct WeakReferenceSentinel : public Object {
-    WeakReferenceSentinel(WeakValue *weakRef, bool *resultPtr)
-        : weakRef(weakRef)
-        , resultPtr(resultPtr) {
-
+    void init(WeakValue *weakRef, bool *resultPtr)
+    {
+        Object::init();
+        this->weakRef = weakRef;
+        this->resultPtr = resultPtr;
     }
 
-    ~WeakReferenceSentinel() {
+    void destroy() {
         *resultPtr = weakRef->isNullOrUndefined();
+        Object::destroy();
     }
 
     WeakValue *weakRef;