don't crash in property access after script class has been set to 0

When the script class is set to 0, we need to remove the script
object's delegate entirely, because the delegate requires a non-0
script class in order to be useful.

Reviewed-by: Olivier Goffart

1 files changed, 11 insertions, 1 deletions

diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp
index 71fcc79cb7..608a134954 100644
--- a/tests/auto/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp
@@ -625,6 +625,7 @@ void tst_QScriptClass::getAndSetProperty()
     QScriptValue obj2 = eng.newObject(&cls);
     QScriptString foo = eng.toStringHandle("foo");
     QScriptString bar = eng.toStringHandle("bar");
+    QScriptValue num(&eng, 123);
 
     // should behave just like normal
     for (int x = 0; x < 2; ++x) {
@@ -644,7 +645,6 @@ void tst_QScriptClass::getAndSetProperty()
 
             // write property
             cls.clearReceivedArgs();
-            QScriptValue num(&eng, 123);
             o.setProperty(s, num);
             QVERIFY(cls.lastQueryPropertyObject().strictlyEquals(o));
             QVERIFY(cls.lastQueryPropertyName() == s);
@@ -712,6 +712,16 @@ void tst_QScriptClass::getAndSetProperty()
         QVERIFY(cls.lastPropertyName() == foo2);
         QCOMPARE(cls.lastPropertyId(), foo2Id);
     }
+
+    // remove script class; normal properties should remain
+    obj1.setScriptClass(0);
+    QCOMPARE(obj1.scriptClass(), (QScriptClass*)0);
+    QVERIFY(obj1.property(foo).equals(num));
+    QVERIFY(obj1.property(bar).equals(num));
+    obj1.setProperty(foo, QScriptValue());
+    QVERIFY(!obj1.property(foo).isValid());
+    obj1.setProperty(bar, QScriptValue());
+    QVERIFY(!obj1.property(bar).isValid());
 }
 
 void tst_QScriptClass::enumerate()