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
  ...

1 files changed, 10 insertions, 28 deletions

diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp
index 3db109e..9b6910e 100644
--- a/src/script/bridge/qscriptobject.cpp
+++ b/src/script/bridge/qscriptobject.cpp
@@ -81,30 +81,21 @@ void QScriptObject::put(JSC::ExecState* exec, const JSC::Identifier& propertyNam
 }
 
 bool QScriptObject::deleteProperty(JSC::ExecState* exec,
-                                   const JSC::Identifier& propertyName,
-                                   bool checkDontDelete)
+                                   const JSC::Identifier& propertyName)
 {
     if (!d || !d->delegate)
-        return JSC::JSObject::deleteProperty(exec, propertyName, checkDontDelete);
-    return d->delegate->deleteProperty(this, exec, propertyName, checkDontDelete);
-}
-
-bool QScriptObject::getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName,
-                                          unsigned& attributes) const
-{
-    if (!d || !d->delegate)
-        return JSC::JSObject::getPropertyAttributes(exec, propertyName, attributes);
-    return d->delegate->getPropertyAttributes(this, exec, propertyName, attributes);
+        return JSC::JSObject::deleteProperty(exec, propertyName);
+    return d->delegate->deleteProperty(this, exec, propertyName);
 }
 
 void QScriptObject::getOwnPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames,
-                                        bool includeNonEnumerable)
+                                        JSC::EnumerationMode mode)
 {
     if (!d || !d->delegate) {
-        JSC::JSObject::getOwnPropertyNames(exec, propertyNames, includeNonEnumerable);
+        JSC::JSObject::getOwnPropertyNames(exec, propertyNames, mode);
         return;
     }
-    d->delegate->getOwnPropertyNames(this, exec, propertyNames, includeNonEnumerable);
+    d->delegate->getOwnPropertyNames(this, exec, propertyNames, mode);
 }
 
 bool QScriptObject::compareToObject(JSC::ExecState* exec, JSC::JSObject *other)
@@ -189,25 +180,16 @@ void QScriptObjectDelegate::put(QScriptObject* object, JSC::ExecState* exec,
 }
 
 bool QScriptObjectDelegate::deleteProperty(QScriptObject* object, JSC::ExecState* exec,
-                                           const JSC::Identifier& propertyName,
-                                           bool checkDontDelete)
-{
-    return object->JSC::JSObject::deleteProperty(exec, propertyName, checkDontDelete);
-}
-
-bool QScriptObjectDelegate::getPropertyAttributes(const QScriptObject* object,
-                                                  JSC::ExecState* exec,
-                                                  const JSC::Identifier& propertyName,
-                                                  unsigned& attributes) const
+                                           const JSC::Identifier& propertyName)
 {
-    return object->JSC::JSObject::getPropertyAttributes(exec, propertyName, attributes);
+    return object->JSC::JSObject::deleteProperty(exec, propertyName);
 }
 
 void QScriptObjectDelegate::getOwnPropertyNames(QScriptObject* object, JSC::ExecState* exec,
                                                 JSC::PropertyNameArray& propertyNames,
-                                                bool includeNonEnumerable)
+                                                JSC::EnumerationMode mode)
 {
-    object->JSC::JSObject::getOwnPropertyNames(exec, propertyNames, includeNonEnumerable);
+    object->JSC::JSObject::getOwnPropertyNames(exec, propertyNames, mode);
 }
 
 void QScriptObjectDelegate::markChildren(QScriptObject* object, JSC::MarkStack& markStack)