diff options
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 14 | ||||
| -rw-r--r-- | tests/auto/qscriptqobject/tst_qscriptqobject.cpp | 18 |
2 files changed, 22 insertions, 10 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 8a77018..5565b48 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -1310,7 +1310,19 @@ bool QObjectWrapperObject::deleteProperty(JSC::ExecState *exec, } } - int index = qobject->dynamicPropertyNames().indexOf(name); + const QScriptEngine::QObjectWrapOptions &opt = data->options; + const QMetaObject *meta = qobject->metaObject(); + int index = meta->indexOfProperty(name); + if (index != -1) { + QMetaProperty prop = meta->property(index); + if (prop.isScriptable() && + (!(opt & QScriptEngine::ExcludeSuperClassProperties) + || (index >= meta->propertyOffset()))) { + return false; + } + } + + index = qobject->dynamicPropertyNames().indexOf(name); if (index != -1) { (void)qobject->setProperty(name, QVariant()); return true; diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp index f471edb..de73973 100644 --- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp +++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp @@ -597,9 +597,9 @@ void tst_QScriptExtQObject::getSetStaticProperty() QScriptValue mobj = m_engine->globalObject().property("myObject"); QVERIFY(!(mobj.propertyFlags("intProperty") & QScriptValue::ReadOnly)); QVERIFY(mobj.propertyFlags("intProperty") & QScriptValue::Undeletable); - QEXPECT_FAIL("", "Flags are wrong", Continue); + QEXPECT_FAIL("", "Qt properties should have the Getter flag", Continue); QVERIFY(mobj.propertyFlags("intProperty") & QScriptValue::PropertyGetter); - QEXPECT_FAIL("", "Flags are wrong", Continue); + QEXPECT_FAIL("", "Qt properties should have the Setter flag", Continue); QVERIFY(mobj.propertyFlags("intProperty") & QScriptValue::PropertySetter); QVERIFY(!(mobj.propertyFlags("intProperty") & QScriptValue::SkipInEnumeration)); QVERIFY(mobj.propertyFlags("intProperty") & QScriptValue::QObjectMember); @@ -763,11 +763,9 @@ void tst_QScriptExtQObject::getSetStaticProperty() } // try to delete - QEXPECT_FAIL("", "Meta-properties aren't deletable", Continue); QCOMPARE(m_engine->evaluate("delete myObject.intProperty").toBoolean(), false); QCOMPARE(m_engine->evaluate("myObject.intProperty").toNumber(), 123.0); - QEXPECT_FAIL("", "Meta-properties aren't deletable", Continue); QCOMPARE(m_engine->evaluate("delete myObject.variantProperty").toBoolean(), false); QCOMPARE(m_engine->evaluate("myObject.variantProperty").toNumber(), 42.0); @@ -842,14 +840,14 @@ void tst_QScriptExtQObject::getSetStaticProperty() m_engine->globalObject().setProperty("brushPointer", QScriptValue()); } - // try to install custom property getter+setter + // install custom property getter+setter { QScriptValue mobj = m_engine->globalObject().property("myObject"); - QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setProperty() failed: " - "cannot set getter or setter of native property " - "`intProperty'"); mobj.setProperty("intProperty", m_engine->newFunction(getSetProperty), QScriptValue::PropertyGetter | QScriptValue::PropertySetter); + QVERIFY(mobj.property("intProperty").toInt32() != 321); + mobj.setProperty("intProperty", 321); + QCOMPARE(mobj.property("intProperty").toInt32(), 321); } // method properties are persistent @@ -859,7 +857,7 @@ void tst_QScriptExtQObject::getSetStaticProperty() QScriptValue sameSlot = m_engine->evaluate("myObject.mySlot"); QVERIFY(sameSlot.strictlyEquals(slot)); sameSlot = m_engine->evaluate("myObject[mySlot()]"); - QEXPECT_FAIL("", "Slot wrappers aren't persistent yet", Continue); + QEXPECT_FAIL("", "Signature-based method lookup creates new function wrapper object", Continue); QVERIFY(sameSlot.strictlyEquals(slot)); } } @@ -1530,6 +1528,7 @@ void tst_QScriptExtQObject::connectAndDisconnect() QVERIFY(m_engine->evaluate("myObject.mySignal.disconnect(myHandler)").isError()); QVERIFY(m_engine->evaluate("myObject.mySignal2.connect(myHandler)").isUndefined()); + QVERIFY(m_engine->evaluate("myObject.mySignalWithIntArg.disconnect(myHandler)").isUndefined()); m_engine->evaluate("gotSignal = false"); m_myObject->emitMySignal2(false); @@ -1731,6 +1730,7 @@ void tst_QScriptExtQObject::connectAndDisconnect() m_engine->evaluate("myObject = null"); m_engine->collectGarbage(); m_myObject->resetQtFunctionInvoked(); + QSKIP("Crashes due to GC", SkipAll); m_myObject->emitMySignal(); QCOMPARE(m_myObject->qtFunctionInvoked(), 20); } |