Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886)

New snapshot with various build fixes

1 files changed, 7 insertions, 11 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index bacae91ec..80f1ba7f0 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -349,10 +349,6 @@ bool QQuickWebViewPrivate::transparentBackground() const
     return webPageProxy->drawsTransparentBackground();
 }
 
-/*!
-    \qmlsignal WebView::loadingChanged(WebLoadRequest request)
-*/
-
 void QQuickWebViewPrivate::provisionalLoadDidStart(const WTF::String& url)
 {
     Q_Q(QQuickWebView);
@@ -1439,7 +1435,6 @@ QQuickWebPage* QQuickWebViewExperimental::page()
 
 /*!
     \page index.html
-
     \title QtWebKit: QML WebView version 3.0
 
     The WebView API allows QML applications to render regions of dynamic
@@ -1447,12 +1442,12 @@ QQuickWebPage* QQuickWebViewExperimental::page()
     QML components or encompass the full screen as specified within the
     QML application.
 
-    QML WebView version 3.0 is incompatible with previous QML 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 may intercept requests to delegate links to
-    other functions.
+    QML WebView version 3.0 is incompatible with previous QML \l
+    {QtWebKit1::WebView} {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
+    may intercept requests to delegate links to other functions.
 
     This sample QML application loads a web page, responds to session
     history context, and intercepts requests for external links:
@@ -1485,6 +1480,7 @@ QQuickWebPage* QQuickWebViewExperimental::page()
 
 /*!
     \qmltype WebView
+    \instantiates QQuickWebView
     \inqmlmodule QtWebKit 3.0
     \brief A WebView renders web content within a QML application
 */