From aacf7c5a8b98f0dd4039d7f7a9d0471c32034a3b Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Thu, 2 Sep 2010 19:12:27 +0200
Subject: Doc: qdoc fixes.

---
 doc/src/getting-started/gettingstartedqml.qdoc                    | 4 ++--
 src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp | 8 ++++----
 src/declarative/graphicsitems/qdeclarativelistview.cpp            | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 771f92e..9e6471e 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -296,8 +296,8 @@
 
     \section2  Using Data Models and Views
 
-    QML has different \l {Data Models}{data views} that display
-    \l {Data Models}{data models}. Our menu bar will display the menus in a list,
+    QML has different \l{QML Data Models}{data views} that display
+    \l{QML Data Models}{data models}. Our menu bar will display the menus in a list,
     with a header that displays a row of menu names. The list of menus are declared
     inside a \c VisualItemModel. The \l{VisualItemModel}{\c VisualItemModel}
     element contains items that already have views such as \c Rectangle elements
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index c1ca23d..1538133 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/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.
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index ef28ab2..412a5f7 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1405,7 +1405,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     to set \e {clip: true} in order to have the out of view items clipped
     nicely.
 
-    \sa {Data Models}, GridView, {declarative/modelviews/listview}{ListView examples}
+    \sa {QML Data Models}, GridView, {declarative/modelviews/listview}{ListView examples}
 */
 
 QDeclarativeListView::QDeclarativeListView(QDeclarativeItem *parent)
-- 
cgit v0.12