Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

3 files changed, 14 insertions, 6 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
index 3af4a29..c538eb1 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
@@ -586,13 +586,14 @@ NEVER_INLINE HandlerInfo* Interpreter::throwException(CallFrame*& callFrame, JSV
     unsigned bytecodeOffsetTemp = bytecodeOffset;
     CodeBlock *codeBlockTemp = codeBlock;
     while (!(handler = codeBlockTemp->handlerForBytecodeOffset(bytecodeOffsetTemp))) {
+        void* returnPC = callFrameTemp->returnPC();
         callFrameTemp = callFrameTemp->callerFrame();
         if (callFrameTemp->hasHostCallFrameFlag()) {
             hasHandler = false;
             break;
         } else {
             codeBlockTemp = callFrameTemp->codeBlock();
-            bytecodeOffsetTemp = bytecodeOffsetForPC(callFrameTemp, codeBlockTemp, callFrameTemp->returnPC());
+            bytecodeOffsetTemp = bytecodeOffsetForPC(callFrameTemp, codeBlockTemp, returnPC);
         }
     }
     if (debugger)
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
index 1268d3d..d7fbce8 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
@@ -233,7 +233,9 @@ void Heap::destroy()
 template <HeapType heapType>
 static NEVER_INLINE CollectorBlock* allocateBlock()
 {
-#if PLATFORM(DARWIN)
+    // Disable the use of vm_map for the Qt build on Darwin, because when compiled on 10.4
+    // it crashes on 10.5
+#if PLATFORM(DARWIN) && !PLATFORM(QT)
     vm_address_t address = 0;
     // FIXME: tag the region as a JavaScriptCore heap when we get a registered VM tag: <rdar://problem/6054788>.
     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);
@@ -285,7 +287,9 @@ static NEVER_INLINE CollectorBlock* allocateBlock()
 
 static void freeBlock(CollectorBlock* block)
 {
-#if PLATFORM(DARWIN)    
+    // Disable the use of vm_deallocate for the Qt build on Darwin, because when compiled on 10.4
+    // it crashes on 10.5
+#if PLATFORM(DARWIN) && !PLATFORM(QT)
     vm_deallocate(current_task(), reinterpret_cast<vm_address_t>(block), BLOCK_SIZE);
 #elif PLATFORM(SYMBIAN)
     userChunk->Free(reinterpret_cast<TAny*>(block));
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index e3c904b..09dfae5 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -139,15 +139,18 @@
 
     \section1 Netscape Plugin Support
 
+    \note Netscape plugin support is only available on desktop platforms.
+
     Since WebKit supports the Netscape Plugin API, Qt applications can display
-    Web pages that embed common plugins, as long as the user has the appropriate
+    Web pages that embed common plugins on platforms for which those plugins
+    are available. To enable plugin support, the user must have the appropriate
     binary files for those plugins installed and the \l{QWebSettings::PluginsEnabled}
-    attribute is enabled for the application.
+    attribute must be enabled for the application.
 
     The following locations are searched for plugins:
 
     \table
-    \header \o Linux/Unix  \o Windows
+    \header \o Linux/Unix (X11)  \o Windows
     \row \o{1,3}
     \list
     \o \c{.mozilla/plugins} in the user's home directory