diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-28 10:40:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-28 10:40:14 (GMT) |
| commit | 4bd7a5df86f1292ad2acaa16a9e9c493c94a9c79 (patch) | |
| tree | f4f7a4c2fe7ff6d18f1a768cb0d352c9bd2b61e9 /src | |
| parent | 59c58576efd3ceff7add46a359fd99e56a2fb279 (diff) | |
| parent | 5b90f7c27e7e4a95c75421fa42345b3268707794 (diff) | |
| download | Qt-4bd7a5df86f1292ad2acaa16a9e9c493c94a9c79.zip Qt-4bd7a5df86f1292ad2acaa16a9e9c493c94a9c79.tar.gz Qt-4bd7a5df86f1292ad2acaa16a9e9c493c94a9c79.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:
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 8 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/VERSION | 4 |
2 files changed, 4 insertions, 8 deletions
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 |