Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9088052f76de19e584cd16fd039502de6b22bec2

5 files changed, 22 insertions, 12 deletions

diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
index a523939b7..8f5a148f9 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -36,9 +36,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <elf.h>
-#if !OS(ANDROID) && !PLATFORM(QT)
-# include <asm/hwcap.h>
-# else
+# if OS(ANDROID) && PLATFORM(QT)
 # include <asm/procinfo.h>
 typedef struct
 {
@@ -48,6 +46,8 @@ typedef struct
         uint32_t a_val;
     } a_un;
 } Elf32_auxv_t;
+# else
+# include <asm/hwcap.h>
 # endif
 #endif
 
diff --git a/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
index a3f44650f..2917815bd 100644
--- a/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
@@ -274,7 +274,7 @@ PassNativeImagePtr ImageFrame::asNewNativeImage() const
 
     QImage img(reinterpret_cast<uchar*>(m_bytes), m_size.width(), m_size.height(), sizeof(PixelData) * m_size.width(), format);
 
-    return new QPixmap(QPixmap::fromImage(img));
+    return new QPixmap(QPixmap::fromImage(img).copy());
 }
 
 }
diff --git a/Source/WebKit/qt/WidgetSupport/PageClientQt.cpp b/Source/WebKit/qt/WidgetSupport/PageClientQt.cpp
index de21c9fd7..792613676 100644
--- a/Source/WebKit/qt/WidgetSupport/PageClientQt.cpp
+++ b/Source/WebKit/qt/WidgetSupport/PageClientQt.cpp
@@ -254,9 +254,12 @@ QRect PageClientQGraphicsWidget::geometryRelativeToOwnerWidget() const
 
 QPoint PageClientQGraphicsWidget::mapToOwnerWindow(const QPoint& point) const
 {
-    if (const QGraphicsView* graphicsView = firstGraphicsView())
+    if (const QGraphicsView* graphicsView = firstGraphicsView()) {
         if (const QWidget *nativeParent = graphicsView->nativeParentWidget())
             return graphicsView->mapTo(nativeParent, graphicsView->mapFromScene(view->mapToScene(point)));
+        else
+            return graphicsView->mapFromScene(view->mapToScene(point));
+    }
     return point;
 }
 
diff --git a/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp b/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp
index be2a42b48..cdadc9c45 100644
--- a/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp
+++ b/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp
@@ -113,9 +113,10 @@ void Connection::platformInitialize(Identifier identifier)
 static dispatch_source_t createDataAvailableSource(mach_port_t receivePort, WorkQueue* workQueue, const Function<void()>& function)
 {
     dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, receivePort, 0, workQueue->dispatchQueue());
-#if COMPILER(GCC)
+#if COMPILER(GCC) && !COMPILER(CLANG)
+    Function<void()> functionCopy = function;
     dispatch_source_set_event_handler(source, ^{
-        function();
+        functionCopy();
     });
 #else
     dispatch_source_set_event_handler(source, function);
@@ -296,7 +297,7 @@ bool Connection::sendOutgoingMessage(PassOwnPtr<MessageEncoder> encoder)
 void Connection::initializeDeadNameSource()
 {
     m_deadNameSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_SEND, m_sendPort, 0, m_connectionQueue->dispatchQueue());
-#if COMPILER(GCC)
+#if COMPILER(GCC) && !COMPILER(CLANG)
     dispatch_source_set_event_handler(m_deadNameSource, ^{
         connectionDidClose();
     });
diff --git a/Source/qtwebkit.qdocconf b/Source/qtwebkit.qdocconf
index f10ef279e..d4da057e0 100644
--- a/Source/qtwebkit.qdocconf
+++ b/Source/qtwebkit.qdocconf
@@ -1,18 +1,24 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project     = QtWebKit
-description = "Qt WebKit API Documentation"
-version     = 5.0.0
+description = Qt WebKit Reference Documentation
+url         = http://qt-project.org/doc/qt-$QT_VER
+version     = $QT_VERSION
 
 # Defines the name of the project. You cannot use operators (+, =, -) in
 # the name. Properties for this project are set using a qhp.<projectname>.property
 # format.
 qhp.projects = QtWebKit
 qhp.QtWebKit.file = qtwebkit.qhp
-qhp.QtWebKit.namespace = org.qt-project.qtwebkit.500
+qhp.QtWebKit.namespace = org.qt-project.qtwebkit.$QT_VERSION_TAG
 qhp.QtWebKit.indexTitle = Qt WebKit
 qhp.QtWebKit.virtualFolder  = qtwebkit
 
+# create a filter for Qt Creator/Assistant
+qhp.QtWebKit.filterAttributes    = qtwebkit $QT_VERSION qtrefdoc
+qhp.QtWebKit.customFilters.Qt.name = QtWebKit $QT_VERSION
+qhp.QtWebKit.customFilters.Qt.filterAttributes = qtwebkit $QT_VERSION
+
 # For listing child nodes in Qt Creator or Assistant.
 qhp.QtWebKit.subprojects = classes qmltypes
 qhp.QtWebKit.subprojects.classes.title = Qt WebKit Widgets
@@ -21,7 +27,7 @@ qhp.QtWebKit.subprojects.classes.selectors = class fake:headerfile
 qhp.QtWebKit.subprojects.classes.sortPages = true
 qhp.QtWebKit.subprojects.qmltypes.title = QML Types
 qhp.QtWebKit.subprojects.qmltypes.indexTitle = Qt WebKit QML Types
-qhp.QtWebKit.subprojects.qmltypes.selectors = fake:headerfile
+qhp.QtWebKit.subprojects.qmltypes.selectors = fake:qmlclass
 qhp.QtWebKit.subprojects.qmltypes.sortPages = true
 
 headerdirs = WebKit/qt/Api WebKit/qt/WidgetApi WebKit2/UIProcess/API/qt