[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d3e3001203c77dba0dc263729bc3fe307bd603bb
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 20:56:59 2010 +0000

    Doc: qdoc fixes.
    
    Patch by David Boddie <david.boddie at nokia.com> on 2010-09-12
    Reviewed by Simon Hausmann.
    
    * declarative/qdeclarativewebview.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67345 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d553dd7..1ef774a 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-12  David Boddie  <david.boddie at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Doc: qdoc fixes.
+
+        * declarative/qdeclarativewebview.cpp:
+
 2010-09-12  Oswald Buddenhagen  <oswald.buddenhagen at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/declarative/qdeclarativewebview.cpp b/WebKit/qt/declarative/qdeclarativewebview.cpp
index c1ca23d..1538133 100644
--- a/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -389,7 +389,7 @@ void QDeclarativeWebView::setPreferredHeight(int height)
 }
 
 /*!
-    \qmlmethod bool WebView::evaluateJavaScript(string)
+    \qmlmethod bool WebView::evaluateJavaScript(string scriptSource)
 
     Evaluates the \a scriptSource JavaScript inside the context of the
     main web frame, and returns the result of the last executed statement.
@@ -513,14 +513,14 @@ void QDeclarativeWebView::setRenderingEnabled(bool enabled)
 }
 
 /*!
-    \qmlsignal WebView::onDoubleClick(clickx, clicky)
+    \qmlsignal WebView::onDoubleClick(int clickx, int clicky)
 
     The WebView does not pass double-click events to the web engine, but rather
     emits this signals.
 */
 
 /*!
-    \qmlmethod bool WebView::heuristicZoom(clickX,clickY,maxzoom)
+    \qmlmethod bool WebView::heuristicZoom(int clickX, int clickY, real maxzoom)
 
     Finds a zoom that:
     \list
@@ -976,7 +976,7 @@ QString QDeclarativeWebPage::chooseFile(QWebFrame* originatingFrame, const QStri
 }
 
 /*!
-    \qmlsignal WebView::onAlert(message)
+    \qmlsignal WebView::onAlert(string message)
 
     The handler is called when the web engine sends a JavaScript alert. The \a message is the text
     to be displayed in the alert to the user.

-- 
WebKit Debian packaging