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

Change-Id: I633b40f8083ed0a056df5effaf19cf22e2f9a5d9

16 files changed, 189 insertions, 168 deletions

diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
index b636e587c..dec9d42a9 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pri
+++ b/Source/JavaScriptCore/JavaScriptCore.pri
@@ -30,7 +30,8 @@ INCLUDEPATH += \
     $$SOURCE_DIR/yarr \
     $$SOURCE_DIR/API \
     $$SOURCE_DIR/ForwardingHeaders \
-    $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR
+    $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR \
+    $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/LLIntOffsetsExtractor$$BIN_EXTENSION
 
 # Pick up the right version of LLIntAssembly.h
 macx: INCLUDEPATH += $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$targetSubDir()
diff --git a/Source/JavaScriptCore/jit/JITStubs.cpp b/Source/JavaScriptCore/jit/JITStubs.cpp
index e4a30aee2..7aaa27867 100644
--- a/Source/JavaScriptCore/jit/JITStubs.cpp
+++ b/Source/JavaScriptCore/jit/JITStubs.cpp
@@ -340,7 +340,7 @@ asm volatile (
 ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
 HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-    "mov.l .L2"SYMBOL_STRING(cti_vm_throw)",r0" "\n"
+    "mov.l .L2" SYMBOL_STRING(cti_vm_throw) ",r0" "\n"
     "mov r15, r4" "\n"
     "mov.l @(r0,r12),r11" "\n"
     "jsr @r11" "\n"
@@ -357,7 +357,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
     "rts" "\n"
     "nop" "\n"
     ".align 2" "\n"
-    ".L2"SYMBOL_STRING(cti_vm_throw)":.long " SYMBOL_STRING(cti_vm_throw)"@GOT \n"
+    ".L2" SYMBOL_STRING(cti_vm_throw) ":.long " SYMBOL_STRING(cti_vm_throw) "@GOT \n"
 );
 
 asm volatile (
@@ -1433,7 +1433,7 @@ MSVC_END(    END)
     SYMBOL_STRING(cti_##op) ":" "\n" \
     "sts pr, r11" "\n" \
     "mov.l r11, @(" STRINGIZE_VALUE_OF(THUNK_RETURN_ADDRESS_OFFSET) ", r15)" "\n" \
-    "mov.l .L2"SYMBOL_STRING(JITStubThunked_##op)",r0" "\n" \
+    "mov.l .L2" SYMBOL_STRING(JITStubThunked_##op) ",r0" "\n" \
     "mov.l @(r0,r12),r11" "\n" \
     "jsr @r11" "\n" \
     "nop" "\n" \
@@ -1442,7 +1442,7 @@ MSVC_END(    END)
     "rts" "\n" \
     "nop" "\n" \
     ".align 2" "\n" \
-    ".L2"SYMBOL_STRING(JITStubThunked_##op)":.long " SYMBOL_STRING(JITStubThunked_##op)"@GOT \n" \
+    ".L2" SYMBOL_STRING(JITStubThunked_##op) ":.long " SYMBOL_STRING(JITStubThunked_##op)"@GOT \n" \
     ); \
     rtype JITStubThunked_##op(STUB_ARGS_DECLARATION)
 #else
diff --git a/Source/ThirdParty/leveldb/Target.pri b/Source/ThirdParty/leveldb/Target.pri
index ed4d8a1c8..abfde15eb 100644
--- a/Source/ThirdParty/leveldb/Target.pri
+++ b/Source/ThirdParty/leveldb/Target.pri
@@ -108,4 +108,9 @@ mac: DEFINES += OS_MACOSX
 linux: DEFINES += OS_LINUX
 freebsd*: DEFINES += OS_FREEBSD
 
+gcc {
+    QMAKE_CXXFLAGS_WARN_ON += -Wno-error=unused-but-set-variable
+    QMAKE_CXXFLAGS += -Wno-error=unused-but-set-variable
+}
+
 QT += core
diff --git a/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp b/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
index 9fb29976b..e0f058600 100644
--- a/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
+++ b/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
@@ -553,6 +553,88 @@ public:
     unsigned m_pageSize;
 };
 
+class ClearObjectStoreListener : public EventListener {
+    WTF_MAKE_NONCOPYABLE(ClearObjectStoreListener);
+public:
+    static PassRefPtr<ClearObjectStoreListener> create(PassRefPtr<ClearObjectStoreCallback> requestCallback)
+    {
+        return adoptRef(new ClearObjectStoreListener(requestCallback));
+    }
+
+    virtual ~ClearObjectStoreListener() { }
+
+    virtual bool operator==(const EventListener& other) OVERRIDE
+    {
+        return this == &other;
+    }
+
+    virtual void handleEvent(ScriptExecutionContext*, Event* event) OVERRIDE
+    {
+        if (!m_requestCallback->isActive())
+            return;
+        if (event->type() != eventNames().completeEvent) {
+            m_requestCallback->sendFailure("Unexpected event type.");
+            return;
+        }
+
+        m_requestCallback->sendSuccess();
+    }
+private:
+    ClearObjectStoreListener(PassRefPtr<ClearObjectStoreCallback> requestCallback)
+        : EventListener(EventListener::CPPEventListenerType)
+        , m_requestCallback(requestCallback)
+    {
+    }
+
+    RefPtr<ClearObjectStoreCallback> m_requestCallback;
+};
+
+class ClearObjectStore : public ExecutableWithDatabase {
+public:
+    static PassRefPtr<ClearObjectStore> create(ScriptExecutionContext* context, const String& objectStoreName, PassRefPtr<ClearObjectStoreCallback> requestCallback)
+    {
+        return adoptRef(new ClearObjectStore(context, objectStoreName, requestCallback));
+    }
+
+    ClearObjectStore(ScriptExecutionContext* context, const String& objectStoreName, PassRefPtr<ClearObjectStoreCallback> requestCallback)
+        : ExecutableWithDatabase(context)
+        , m_objectStoreName(objectStoreName)
+        , m_requestCallback(requestCallback)
+    {
+    }
+
+    virtual void execute(PassRefPtr<IDBDatabase> prpDatabase)
+    {
+        RefPtr<IDBDatabase> idbDatabase = prpDatabase;
+        if (!requestCallback()->isActive())
+            return;
+        RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), idbDatabase.get(), m_objectStoreName, IDBTransaction::modeReadWrite());
+        if (!idbTransaction) {
+            m_requestCallback->sendFailure("Could not get transaction");
+            return;
+        }
+        RefPtr<IDBObjectStore> idbObjectStore = objectStoreForTransaction(idbTransaction.get(), m_objectStoreName);
+        if (!idbObjectStore) {
+            m_requestCallback->sendFailure("Could not get object store");
+            return;
+        }
+
+        ExceptionCode ec = 0;
+        RefPtr<IDBRequest> idbRequest = idbObjectStore->clear(context(), ec);
+        ASSERT(!ec);
+        if (ec) {
+            m_requestCallback->sendFailure(String::format("Could not clear object store '%s': %d", m_objectStoreName.utf8().data(), ec));
+            return;
+        }
+        idbTransaction->addEventListener(eventNames().completeEvent, ClearObjectStoreListener::create(m_requestCallback), false);
+    }
+
+    virtual RequestCallback* requestCallback() { return m_requestCallback.get(); }
+private:
+    const String m_objectStoreName;
+    RefPtr<ClearObjectStoreCallback> m_requestCallback;
+};
+
 } // namespace
 
 InspectorIndexedDBAgent::InspectorIndexedDBAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InjectedScriptManager* injectedScriptManager, InspectorPageAgent* pageAgent)
@@ -669,89 +751,6 @@ void InspectorIndexedDBAgent::requestData(ErrorString* errorString, const String
     dataLoader->start(idbFactory, document->securityOrigin(), databaseName);
 }
 
-class ClearObjectStoreListener : public EventListener {
-    WTF_MAKE_NONCOPYABLE(ClearObjectStoreListener);
-public:
-    static PassRefPtr<ClearObjectStoreListener> create(PassRefPtr<ClearObjectStoreCallback> requestCallback)
-    {
-        return adoptRef(new ClearObjectStoreListener(requestCallback));
-    }
-
-    virtual ~ClearObjectStoreListener() { }
-
-    virtual bool operator==(const EventListener& other) OVERRIDE
-    {
-        return this == &other;
-    }
-
-    virtual void handleEvent(ScriptExecutionContext*, Event* event) OVERRIDE
-    {
-        if (!m_requestCallback->isActive())
-            return;
-        if (event->type() != eventNames().completeEvent) {
-            m_requestCallback->sendFailure("Unexpected event type.");
-            return;
-        }
-
-        m_requestCallback->sendSuccess();
-    }
-private:
-    ClearObjectStoreListener(PassRefPtr<ClearObjectStoreCallback> requestCallback)
-        : EventListener(EventListener::CPPEventListenerType)
-        , m_requestCallback(requestCallback)
-    {
-    }
-
-    RefPtr<ClearObjectStoreCallback> m_requestCallback;
-};
-
-
-class ClearObjectStore : public ExecutableWithDatabase {
-public:
-    static PassRefPtr<ClearObjectStore> create(ScriptExecutionContext* context, const String& objectStoreName, PassRefPtr<ClearObjectStoreCallback> requestCallback)
-    {
-        return adoptRef(new ClearObjectStore(context, objectStoreName, requestCallback));
-    }
-
-    ClearObjectStore(ScriptExecutionContext* context, const String& objectStoreName, PassRefPtr<ClearObjectStoreCallback> requestCallback)
-        : ExecutableWithDatabase(context)
-        , m_objectStoreName(objectStoreName)
-        , m_requestCallback(requestCallback)
-    {
-    }
-
-    virtual void execute(PassRefPtr<IDBDatabase> prpDatabase)
-    {
-        RefPtr<IDBDatabase> idbDatabase = prpDatabase;
-        if (!requestCallback()->isActive())
-            return;
-        RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), idbDatabase.get(), m_objectStoreName, IDBTransaction::modeReadWrite());
-        if (!idbTransaction) {
-            m_requestCallback->sendFailure("Could not get transaction");
-            return;
-        }
-        RefPtr<IDBObjectStore> idbObjectStore = objectStoreForTransaction(idbTransaction.get(), m_objectStoreName);
-        if (!idbObjectStore) {
-            m_requestCallback->sendFailure("Could not get object store");
-            return;
-        }
-
-        ExceptionCode ec = 0;
-        RefPtr<IDBRequest> idbRequest = idbObjectStore->clear(context(), ec);
-        ASSERT(!ec);
-        if (ec) {
-            m_requestCallback->sendFailure(String::format("Could not clear object store '%s': %d", m_objectStoreName.utf8().data(), ec));
-            return;
-        }
-        idbTransaction->addEventListener(eventNames().completeEvent, ClearObjectStoreListener::create(m_requestCallback), false);
-    }
-
-    virtual RequestCallback* requestCallback() { return m_requestCallback.get(); }
-private:
-    const String m_objectStoreName;
-    RefPtr<ClearObjectStoreCallback> m_requestCallback;
-};
-
 void InspectorIndexedDBAgent::clearObjectStore(ErrorString* errorString, const String& securityOrigin, const String& databaseName, const String& objectStoreName, PassRefPtr<ClearObjectStoreCallback> requestCallback)
 {
     Frame* frame = m_pageAgent->findFrameWithSecurityOrigin(securityOrigin);
diff --git a/Source/WebCore/platform/qt/PasteboardQt.cpp b/Source/WebCore/platform/qt/PasteboardQt.cpp
index a35809f48..e6e18c9a7 100644
--- a/Source/WebCore/platform/qt/PasteboardQt.cpp
+++ b/Source/WebCore/platform/qt/PasteboardQt.cpp
@@ -34,6 +34,7 @@
 #include "DragData.h"
 #include "Editor.h"
 #include "Frame.h"
+#include "HTMLElement.h"
 #include "Image.h"
 #include "NotImplemented.h"
 #include "RenderImage.h"
@@ -115,51 +116,64 @@ Pasteboard* Pasteboard::generalPasteboard()
 
 void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, Frame* frame, ShouldSerializeSelectedTextForClipboard shouldSerializeSelectedTextForClipboard)
 {
-    QMimeData* md = new QMimeData;
+    if (!m_writableData)
+        m_writableData = new QMimeData;
     QString text = shouldSerializeSelectedTextForClipboard == IncludeImageAltTextForClipboard ? frame->editor().selectedTextForClipboard() : frame->editor().selectedText();
     text.replace(QChar(0xa0), QLatin1Char(' '));
-    md->setText(text);
+    m_writableData->setText(text);
 
     QString markup = createMarkup(selectedRange, 0, AnnotateForInterchange, false, ResolveNonLocalURLs);
 #ifdef Q_OS_MAC
     markup.prepend(QLatin1String("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head><body>"));
     markup.append(QLatin1String("</body></html>"));
-    md->setData(QLatin1String("text/html"), markup.toUtf8());
+    m_writableData->setData(QLatin1String("text/html"), markup.toUtf8());
 #else
-    md->setHtml(markup);
+    m_writableData->setHtml(markup);
 #endif
 
     if (canSmartCopyOrDelete)
-        md->setData(QLatin1String("application/vnd.qtwebkit.smartpaste"), QByteArray());
+        m_writableData->setData(QStringLiteral("application/vnd.qtwebkit.smartpaste"), QByteArray());
 #ifndef QT_NO_CLIPBOARD
-    QGuiApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+    if (isForCopyAndPaste())
+        QGuiApplication::clipboard()->setMimeData(m_writableData, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #endif
 }
 
 bool Pasteboard::canSmartReplace()
 {
 #ifndef QT_NO_CLIPBOARD
-    if (QGuiApplication::clipboard()->mimeData()->hasFormat((QLatin1String("application/vnd.qtwebkit.smartpaste"))))
+    if (isForCopyAndPaste() && QGuiApplication::clipboard()->mimeData()->hasFormat(QStringLiteral("application/vnd.qtwebkit.smartpaste")))
         return true;
 #endif
+    if (const QMimeData* data = readData())
+        return data->hasFormat(QStringLiteral("application/vnd.qtwebkit.smartpaste"));
+
     return false;
 }
 
 String Pasteboard::plainText(Frame*)
 {
 #ifndef QT_NO_CLIPBOARD
-    return QGuiApplication::clipboard()->text(m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
-#else
-    return String();
+    if (isForCopyAndPaste())
+        return QGuiApplication::clipboard()->text(m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #endif
+    if (const QMimeData* data = readData())
+        return data->text();
+    return String();
 }
 
 PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefPtr<Range> context,
                                                           bool allowPlainText, bool& chosePlainText)
 {
 #ifndef QT_NO_CLIPBOARD
-    const QMimeData* mimeData = QGuiApplication::clipboard()->mimeData(
-            m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+    const QMimeData* mimeData = 0;
+    if (isForCopyAndPaste())
+        mimeData = QGuiApplication::clipboard()->mimeData(m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+    else
+        mimeData = readData();
+#endif
+    if (!mimeData)
+        return 0;
 
     chosePlainText = false;
 
@@ -172,50 +186,67 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP
         }
     }
 
+    if (mimeData->hasImage()) {
+        if (mimeData->hasUrls()) {
+            QList<QUrl> urls = mimeData->urls();
+            QString title = mimeData->text();
+            if (!title.isEmpty())
+                title = QStringLiteral(" title=\"") + title + QStringLiteral("\"");
+            if (urls.count() == 1) {
+                QString html = QStringLiteral("<img src=\"") + urls.first().toEncoded() + QStringLiteral("\"") + title + QStringLiteral(">");
+                RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(frame->document(), html, "", DisallowScriptingAndPluginContent);
+                if (fragment)
+                    return fragment.release();
+            }
+        }
+        // FIXME: We could fallback to a raw encoded data URL.
+    }
+
     if (allowPlainText && mimeData->hasText()) {
         chosePlainText = true;
         RefPtr<DocumentFragment> fragment = createFragmentFromText(context.get(), mimeData->text());
         if (fragment)
             return fragment.release();
     }
-#endif
     return 0;
 }
 
 void Pasteboard::writePlainText(const String& text, SmartReplaceOption smartReplaceOption)
 {
-#ifndef QT_NO_CLIPBOARD
-    QMimeData* md = new QMimeData;
+    if (!m_writableData)
+        m_writableData = new QMimeData;
     QString qtext = text;
     qtext.replace(QChar(0xa0), QLatin1Char(' '));
-    md->setText(qtext);
+    m_writableData->setText(qtext);
     if (smartReplaceOption == CanSmartReplace)
-        md->setData(QLatin1String("application/vnd.qtwebkit.smartpaste"), QByteArray());
-    QGuiApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+        m_writableData->setData(QLatin1String("application/vnd.qtwebkit.smartpaste"), QByteArray());
+#ifndef QT_NO_CLIPBOARD
+    if (isForCopyAndPaste())
+        QGuiApplication::clipboard()->setMimeData(m_writableData, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #endif
 }
 
-void Pasteboard::writeURL(const KURL& url, const String&, Frame*)
+void Pasteboard::writeURL(const KURL& url, const String& title, Frame*)
 {
     ASSERT(!url.isEmpty());
 
+    if (!m_writableData)
+        m_writableData = new QMimeData;
+    m_writableData->setText(title);
+    m_writableData->setUrls(QList<QUrl>() << url);
 #ifndef QT_NO_CLIPBOARD
-    QMimeData* md = new QMimeData;
-    QString urlString = url.string();
-    md->setText(urlString);
-    md->setUrls(QList<QUrl>() << url);
-    QGuiApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+    if (isForCopyAndPaste())
+        QGuiApplication::clipboard()->setMimeData(m_writableData, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #endif
 }
 
-void Pasteboard::writeImage(Node* node, const KURL&, const String&)
+void Pasteboard::writeImage(Node* node, const KURL& url, const String& title)
 {
     ASSERT(node);
 
     if (!(node->renderer() && node->renderer()->isImage()))
         return;
 
-#ifndef QT_NO_CLIPBOARD
     CachedImage* cachedImage = toRenderImage(node->renderer())->cachedImage();
     if (!cachedImage || cachedImage->errorOccurred())
         return;
@@ -226,7 +257,19 @@ void Pasteboard::writeImage(Node* node, const KURL&, const String&)
     QPixmap* pixmap = image->nativeImageForCurrentFrame();
     if (!pixmap)
         return;
-    QGuiApplication::clipboard()->setPixmap(*pixmap, QClipboard::Clipboard);
+    if (!m_writableData)
+        m_writableData = new QMimeData;
+    m_writableData->setImageData(pixmap->toImage());
+    if (!title.isEmpty())
+        m_writableData->setText(title);
+    m_writableData->setUrls(QList<QUrl>() << url);
+
+    if (node->isHTMLElement())
+        m_writableData->setHtml(static_cast<HTMLElement*>(node)->outerHTML());
+
+#ifndef QT_NO_CLIPBOARD
+    if (isForCopyAndPaste())
+        QGuiApplication::clipboard()->setMimeData(m_writableData, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #endif
 }
 
@@ -355,6 +398,7 @@ void Pasteboard::setDragImage(DragImageRef, const IntPoint& hotSpot)
 
 void Pasteboard::writePasteboard(const Pasteboard& sourcePasteboard)
 {
+    ASSERT(isForCopyAndPaste());
 #ifndef QT_NO_CLIPBOARD
     QGuiApplication::clipboard()->setMimeData(sourcePasteboard.clipboardData());
 #endif
diff --git a/Source/WebCore/platform/qt/UserAgentQt.cpp b/Source/WebCore/platform/qt/UserAgentQt.cpp
index 3dcf879b2..6f1da23c9 100644
--- a/Source/WebCore/platform/qt/UserAgentQt.cpp
+++ b/Source/WebCore/platform/qt/UserAgentQt.cpp
@@ -45,7 +45,7 @@ namespace WebCore {
     \li %Security% expands to "N; " if SSL is disabled.
     \li %Subplatform% expands to the operating system version (e.g. "Windows NT 6.1" or "Intel Mac OS X 10.5").
     \li %WebKitVersion% is the version of WebKit the application was compiled against.
-    /endlist
+    \endlist
 
     The following value is replaced each time the funciton is called
     \list
diff --git a/Source/WebKit/qt/Api/qwebelement.cpp b/Source/WebKit/qt/Api/qwebelement.cpp
index 17811cdc1..26aedc1f5 100644
--- a/Source/WebKit/qt/Api/qwebelement.cpp
+++ b/Source/WebKit/qt/Api/qwebelement.cpp
@@ -1529,6 +1529,7 @@ QWebElementCollectionPrivate* QWebElementCollectionPrivate::create(const PassRef
 
 /*!
     \class QWebElementCollection
+    \inmodule QtWebKit
     \since 4.6
     \brief The QWebElementCollection class represents a collection of web elements.
     \preliminary
@@ -1719,6 +1720,7 @@ QList<QWebElement> QWebElementCollection::toList() const
 
 /*!
     \class QWebElementCollection::const_iterator
+    \inmodule QtWebKit
     \since 4.6
     \brief The QWebElementCollection::const_iterator class provides an STL-style const iterator for QWebElementCollection.
 
@@ -1909,6 +1911,7 @@ QList<QWebElement> QWebElementCollection::toList() const
 
 /*!
     \class QWebElementCollection::iterator
+    \inmodule QtWebKit
     \since 4.6
     \brief The QWebElementCollection::iterator class provides an STL-style iterator for QWebElementCollection.
 
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp
index f8e4d42ed..325342e86 100644
--- a/Source/WebKit/qt/Api/qwebsettings.cpp
+++ b/Source/WebKit/qt/Api/qwebsettings.cpp
@@ -371,7 +371,7 @@ QWebSettings* QWebSettings::globalSettings()
     setOfflineStoragePath() with an appropriate file path, and can limit the quota
     for each application by calling setOfflineStorageDefaultQuota().
 
-    \sa QWebPage::settings(), QWebView::settings(), {Web Browser}
+    \sa QWebPage::settings(), QWebView::settings(), {Tab Browser}
 */
 
 /*!
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h
index 4cca4d7a5..e5cd4a6bb 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h
+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h
@@ -22,6 +22,8 @@
 
 #include "FrameLoaderClientQt.h"
 #include "PlatformEvent.h"
+#include "PlatformExportMacros.h"
+
 #if ENABLE(ORIENTATION_EVENTS) && HAVE(QTSENSORS)
 #include "qorientationsensor.h"
 #endif // ENABLE(ORIENTATION_EVENTS).
diff --git a/Source/WebKit/qt/WidgetApi/qgraphicswebview.cpp b/Source/WebKit/qt/WidgetApi/qgraphicswebview.cpp
index 4aa6a5f8d..a35252093 100644
--- a/Source/WebKit/qt/WidgetApi/qgraphicswebview.cpp
+++ b/Source/WebKit/qt/WidgetApi/qgraphicswebview.cpp
@@ -142,6 +142,7 @@ void QGraphicsWebViewPrivate::_q_scaleChanged()
 /*!
     \class QGraphicsWebView
     \brief The QGraphicsWebView class allows Web content to be added to a GraphicsView.
+    \inmodule QtWebKit
     \since 4.6
 
     An instance of this class renders Web content from a URL or supplied as data, using
@@ -170,33 +171,6 @@ void QGraphicsWebViewPrivate::_q_scaleChanged()
 */
 
 /*!
-    \fn void QGraphicsWebView::titleChanged(const QString &title)
-
-    This signal is emitted whenever the \a title of the main frame changes.
-
-    \sa title()
-*/
-
-/*!
-    \fn void QGraphicsWebView::urlChanged(const QUrl &url)
-
-    This signal is emitted when the \a url of the view changes.
-
-    \sa url(), load()
-*/
-
-/*!
-    \fn void QGraphicsWebView::iconChanged()
-
-    This signal is emitted whenever the icon of the page is loaded or changes.
-
-    In order for icons to be loaded, you will need to set an icon database path
-    using QWebSettings::setIconDatabasePath().
-
-    \sa icon(), QWebSettings::setIconDatabasePath()
-*/
-
-/*!
     \fn void QGraphicsWebView::loadStarted()
 
     This signal is emitted when a new load of the page is started.
@@ -524,7 +498,7 @@ void QGraphicsWebView::setPage(QWebPage* page)
 
     By default, this property contains an empty, invalid URL.
 
-    \sa load(), urlChanged()
+    \sa load()
 */
 
 void QGraphicsWebView::setUrl(const QUrl &url)
@@ -545,8 +519,6 @@ QUrl QGraphicsWebView::url() const
     \brief the title of the web page currently viewed
 
     By default, this property contains an empty string.
-
-    \sa titleChanged()
 */
 QString QGraphicsWebView::title() const
 {
@@ -562,7 +534,10 @@ QString QGraphicsWebView::title() const
 
     By default, this property contains a null icon.
 
-    \sa iconChanged(), QWebSettings::iconForUrl()
+    In order for icons to be loaded, you will need to set an icon database path
+    using QWebSettings::setIconDatabasePath().
+
+    \sa QWebSettings::iconForUrl(), QWebSettings::setIconDatabasePath()
 */
 QIcon QGraphicsWebView::icon() const
 {
@@ -675,7 +650,7 @@ void QGraphicsWebView::reload()
 
     \note The view remains the same until enough data has arrived to display the new \a url.
 
-    \sa setUrl(), url(), urlChanged()
+    \sa setUrl(), url()
 */
 void QGraphicsWebView::load(const QUrl& url)
 {
@@ -691,7 +666,7 @@ void QGraphicsWebView::load(const QUrl& url)
 
     \note The view remains the same until enough data has arrived to display the new url.
 
-    \sa url(), urlChanged()
+    \sa url()
 */
 
 void QGraphicsWebView::load(const QNetworkRequest& request, QNetworkAccessManager::Operation operation, const QByteArray& body)
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
index e19d7bc79..442cc4874 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
@@ -3474,9 +3474,4 @@ QWebPage::VisibilityState QWebPage::visibilityState() const
   This signal is emitted when the load of \a frame is finished and the application may now update its state accordingly.
 */
 
-/*!
-  \fn QWebPagePrivate* QWebPage::handle() const
-  \internal
-*/
-
 #include "moc_qwebpage.cpp"
diff --git a/Source/WebKit/qt/WidgetApi/qwebview.cpp b/Source/WebKit/qt/WidgetApi/qwebview.cpp
index f5c4050c9..1a35b325c 100644
--- a/Source/WebKit/qt/WidgetApi/qwebview.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebview.cpp
@@ -147,8 +147,8 @@ void QWebViewPrivate::_q_pageDestroyed()
     if you do not require QWidget attributes. Nevertheless, Qt WebKit depends
     on QtGui, so you should use a QApplication instead of QCoreApplication.
 
-    \sa {Previewer Example}, {Web Browser}, {Form Extractor Example},
-    {Google Chat Example}, {Fancy Browser Example}
+    \sa {Previewer Example}, {Tab Browser}, {Form Extractor Example},
+    {Fancy Browser Example}
 */
 
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/Source/WebKit/qt/docs/qtwebkit-goes-mobile.qdoc b/Source/WebKit/qt/docs/qtwebkit-goes-mobile.qdoc
index f1236b9c0..60787721e 100644
--- a/Source/WebKit/qt/docs/qtwebkit-goes-mobile.qdoc
+++ b/Source/WebKit/qt/docs/qtwebkit-goes-mobile.qdoc
@@ -155,9 +155,9 @@
     More info can be found in the
     \l{http://developer.apple.com/safari/library/documentation/appleapplications/reference/safariwebcontent/usingtheviewport/usingtheviewport.html}{Safari Developer Library}.
 
-    You must connect the signal \c{QWebPage::viewportChangeRequested(const
-    QWebPage::ViewportHints& hints)} to a slot of your mobile web view and use what
-    is provided by \l{QWebPage::ViewportHints} to update your viewport size, scale
+    You must connect the signal \c{QWebPage::viewportChangeRequested()}
+    to a slot of your mobile web view and use what
+    is provided by \l{QWebPage::ViewportAttributes} to update your viewport size, scale
     range, and so on.
 
 
diff --git a/Source/WebKit/qt/docs/qtwebkit.qdoc b/Source/WebKit/qt/docs/qtwebkit.qdoc
index f7dcfcb12..e36cdeb62 100644
--- a/Source/WebKit/qt/docs/qtwebkit.qdoc
+++ b/Source/WebKit/qt/docs/qtwebkit.qdoc
@@ -3,6 +3,7 @@
     \title Qt WebKit Widgets C++ Classes
     \brief Provides a web browser engine as well as C++ classes to render and
     interact with web content
+    \qtvariable webkitwidgets
 
     To include the definitions of the module's classes, use the
     following directive:
@@ -58,7 +59,7 @@
     attribute on HTML elements.
 
     QtWebKit has been enhanced to become more attractive on the mobile front as well.
-    For more information see \l{QtWebKit Goes Mobile}.
+    For more information see \l{Qt WebKit Goes Mobile}.
 
     Qt WebKit is based on the Open Source WebKit engine. More information about
     WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
@@ -87,10 +88,6 @@
     \note Web site icons, also known as "FavIcons", are currently not supported
     on Windows. We plan to address this in a future release.
 
-    \note WebKit has certain minimum requirements that must be met on
-    Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements}
-    document for more information.
-
     \section1 Architecture
 
     The easiest way to render content is through the QWebView class. As a
diff --git a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc
index d4fc2bd85..69814b023 100644
--- a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc
+++ b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc
@@ -1,8 +1,8 @@
 //! [0]
-QT += webkit
+QT += webkitwidgets
 //! [0]
 
 
 //! [1]
-#include <QtWebKit>
+#include <QtWebKitWidgets>
 //! [1]
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index 30b6984cc..c3cc68a7b 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -1590,7 +1590,7 @@ QQuickWebPage* QQuickWebViewExperimental::page()
     specified within the QML application.
 
     QML WebView version 3.0 is incompatible with previous QML \l
-    {QtWebKit1::WebView} {WebView} API versions.  It allows an
+    WebView API versions.  It allows an
     application to load pages into the WebView, either by URL or with
     an HTML string, and navigate within session history.  By default,
     links to different pages load within the same WebView, but applications