diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 15:43:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 15:43:24 (GMT) |
| commit | d9f10e4e4c73e5d4bb1cfe4641ef25910edba2ec (patch) | |
| tree | df8eb85681f62e5cacece3b5609c8d5d5f997e79 /src/script/bridge/qscriptdeclarativeobject_p.h | |
| parent | 2504c2d4b1a7ae952005f9736c7f0399b31b1864 (diff) | |
| parent | ebf21bfac7009a72926010527226b1815f49a71d (diff) | |
| download | Qt-d9f10e4e4c73e5d4bb1cfe4641ef25910edba2ec.zip Qt-d9f10e4e4c73e5d4bb1cfe4641ef25910edba2ec.tar.gz Qt-d9f10e4e4c73e5d4bb1cfe4641ef25910edba2ec.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits)
Fix compilation with namespaced Qt
Add a placeholder text into the new search lineedit
Ui improvements to QDBusViewer.
Make double-clicking a d-bus method work again
Changed Qdbusviewer to match D-Bus type signature in addition to method name when finding a method.
qdoc: Added debug code.
Update separate regions instead of their bounding box.
doc: Fixed three new qdoc errors.
Autotest: make the qabstractslider test pass on mac
Compile
Mac: scroll speed does not match native applications
qdoc: Fixed lookup of QML property nodes.
configure.exe: Fix inverted logic
Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+Insert
Compile
QtScript: Improve performance of type resolution when calling slots
Improve performance of QScriptValueIterator
Add default argument values for QScriptValuePrivate property functions
Move method implementation to private class
Add benchmarks for QScriptValueIterator
...
Diffstat (limited to 'src/script/bridge/qscriptdeclarativeobject_p.h')
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeobject_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/script/bridge/qscriptdeclarativeobject_p.h b/src/script/bridge/qscriptdeclarativeobject_p.h index ec8a43e..5024a71 100644 --- a/src/script/bridge/qscriptdeclarativeobject_p.h +++ b/src/script/bridge/qscriptdeclarativeobject_p.h @@ -81,14 +81,10 @@ public: const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual bool deleteProperty(QScriptObject*, JSC::ExecState*, - const JSC::Identifier& propertyName, - bool checkDontDelete = true); - virtual bool getPropertyAttributes(const QScriptObject*, JSC::ExecState*, - const JSC::Identifier&, - unsigned&) const; + const JSC::Identifier& propertyName); virtual void getOwnPropertyNames(QScriptObject*, JSC::ExecState*, JSC::PropertyNameArray&, - bool includeNonEnumerable = false); + JSC::EnumerationMode mode = JSC::ExcludeDontEnumProperties); virtual JSC::CallType getCallData(QScriptObject*, JSC::CallData&); static JSC::JSValue JSC_HOST_CALL call(JSC::ExecState*, JSC::JSObject*, |