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:
  doc: update the ECMAScript reference
  Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-28062010 ( f483443ccd7d21f2a57a794c4d00a63505d2f5d9 )
  doc: Added more DITA output to the XML generator

4 files changed, 59 insertions, 11 deletions

diff --git a/doc/src/scripting/ecmascript.qdoc b/doc/src/scripting/ecmascript.qdoc
index 4497a0b..508bf3b 100644
--- a/doc/src/scripting/ecmascript.qdoc
+++ b/doc/src/scripting/ecmascript.qdoc
@@ -30,8 +30,9 @@
     \title ECMAScript Reference
     \brief A list of objects, functions and properties supported by QtScript.
 
-    This reference contains a list of objects, functions and
-    properties supported by QtScript.
+    This reference contains a list of built-in objects, functions and
+    properties supported by QtScript. For a detailed description, see
+    the \l{ECMA-262} specification.
 
     \tableofcontents
 
@@ -43,7 +44,6 @@
     \o NaN
     \o Infinity
     \o undefined
-    \o Math
     \endlist
 
     \section2 Function Properties
@@ -80,10 +80,33 @@
     \o URIError
     \endlist
 
+    \section2 Other Properties
+
+    \list
+    \o Math
+    \o JSON
+    \endlist
+
     \section1 Object Objects
 
+    \section2 Object Constructor
+
+    \section3 Function Properties
+
+    \list
+    \o getPrototypeOf(O)
+    \o getOwnPropertyDescriptor(O, P)
+    \o getOwnPropertyNames(O)
+    \o create(O [, Properties])
+    \o defineProperty(O, P, Attributes)
+    \o defineProperties(O, Properties)
+    \o keys(O)
+    \endlist
+
     \section2 Object Prototype Object
 
+    \section3 Function Properties
+
     \list
     \o toString()
     \o toLocaleString()
@@ -124,6 +147,15 @@
     \o sort(comparefn)
     \o splice(start, deleteCount[, item1 [, item2 [, ...]]])
     \o unshift([item1 [, item2 [, ...]]])
+    \o indexOf(searchElement [, fromIndex])
+    \o lastIndexOf(searchElement [, fromIndex])
+    \o every(callbackfn [, thisArg])
+    \o some(callbackfn [, thisArg])
+    \o forEach(callbackfn [, thisArg])
+    \o map(callbackfn [, thisArg])
+    \o filter(callbackfn [, thisArg])
+    \o reduce(callbackfn [, initialValue])
+    \o reduceRight(callbackfn [, initialValue])
     \endlist
 
     \section1 String Objects
@@ -151,6 +183,7 @@
     \o toLocaleLowerCase()
     \o toUpperCase()
     \o toLocaleUpperCase()
+    \o trim()
     \endlist
 
     \section1 Boolean Objects
@@ -264,6 +297,8 @@
     \o setFullYear(year [, month [, date]])
     \o setUTCFullYear(year [, month [, date]])
     \o toUTCString()
+    \o toISOString()
+    \o toJSON()
     \endlist
 
     \section1 RegExp Objects
@@ -295,4 +330,13 @@
     \o toString()
     \endlist
 
+    \section1 The JSON Object
+
+    \section2 Function Properties
+
+    \list
+    \o parse(text [, reviver])
+    \o stringify(value [, replacer [, space]])
+    \endlist
+
 */
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
index eafcc23..24873c8 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
@@ -217,9 +217,7 @@ void Heap::destroy()
 
 NEVER_INLINE CollectorBlock* Heap::allocateBlock()
 {
-    // Disable the use of vm_map for the Qt build on Darwin, because when compiled on 10.4
-    // it crashes on 10.5
-#if OS(DARWIN) && !PLATFORM(QT)
+#if OS(DARWIN)
     vm_address_t address = 0;
     vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, VM_FLAGS_ANYWHERE | VM_TAG_FOR_COLLECTOR_MEMORY, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT);
 #elif OS(SYMBIAN)
@@ -315,9 +313,7 @@ NEVER_INLINE void Heap::freeBlock(size_t block)
 
 NEVER_INLINE void Heap::freeBlockPtr(CollectorBlock* block)
 {
-    // Disable the use of vm_deallocate for the Qt build on Darwin, because when compiled on 10.4
-    // it crashes on 10.5
-#if OS(DARWIN) && !PLATFORM(QT)
+#if OS(DARWIN)    
     vm_deallocate(current_task(), reinterpret_cast<vm_address_t>(block), BLOCK_SIZE);
 #elif OS(SYMBIAN)
     userChunk->Free(reinterpret_cast<TAny*>(block));
diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION
index daecc37..4e01d20 100644
--- a/src/3rdparty/javascriptcore/VERSION
+++ b/src/3rdparty/javascriptcore/VERSION
@@ -4,8 +4,8 @@ This is a snapshot of JavaScriptCore from
 
 The commit imported was from the
 
-        javascriptcore-snapshot-16062010 branch/tag
+        javascriptcore-snapshot-28062010 branch/tag
 
 and has the sha1 checksum
 
-        8b2d3443afca194f8ac50a63151dc9d19a150582
+        f483443ccd7d21f2a57a794c4d00a63505d2f5d9
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index 0135983..d48a578 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -1,3 +1,4 @@
+
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -5009,6 +5010,13 @@ void DitaXmlGenerator::writeDataMembers(const Section& s,
             writer.writeAttribute("value",vn->accessString());
             writer.writeEndElement(); // <cxxVariableAccessSpecifier>
 
+            if (vn->isStatic()) {
+                writer.writeStartElement(CXXVARIABLESTORAGECLASSSPECIFIERSTATIC);
+                writer.writeAttribute("name","static");
+                writer.writeAttribute("value","static");
+                writer.writeEndElement(); // <cxxVariableStorageClassSpecifierStatic>
+            }
+
             writer.writeStartElement(CXXVARIABLEDECLAREDTYPE);
             writer.writeCharacters(vn->leftType());
             if (!vn->rightType().isEmpty())