Various qt documentation fixes (wk 40&41)

Fixes for bugs: QTBUG-21067, QTBUG-17025, QTBUG-11489, QTBUG-20069,
QTBUG-3563, QTBUG-20089, QTBUG-13983, QTBUG-11820, QTBUG-14732,
QTBUG-14521, QTBUG-9675, QTBUG-18313, QTBUG-18313, QTBUG-11312,
QTBUG-17739, QTBUG-7678, QTBUG-14759, QTBUG-14756, QTBUG-14677,
QTBUG-16164, QTBUG-20721, QTBUG-15562, QTBUG-17029 and QTBUG-18544.

6 files changed, 22 insertions, 20 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
index b1781a6..59c124c 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
@@ -57,7 +57,7 @@ static void findButtonAndClick()
      */
 
     QWebElement button = document.findFirst("input[type=submit]");
-    button.evaluateJavaScript("click()");
+    button.evaluateJavaScript("this.click()");
 
 //! [Calling a DOM element method]
 
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index 1859e65..a7df91c 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -97,7 +97,7 @@
     Note that class \c T must inherit QObject, or a compilation or
     link error will result.
 
-    \sa QSharedPointer, QObject, QObjectCleanupHandler
+    \sa QSharedPointer, QWeakPointer, QObject, QObjectCleanupHandler
 */
 
 /*!
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index 0f67652..a909b43 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -155,7 +155,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn int QLine::dx() const
 
-    Returns the horizontal component of the line's vector.
+    Returns the horizontal component of the line's vector. 
+    Return value is positive if x2() >= x1() and negative if x2() < x1().
 
     \sa dy()
 */
@@ -164,6 +165,7 @@ QT_BEGIN_NAMESPACE
     \fn int QLine::dy() const
 
     Returns the vertical component of the line's vector.
+    Return value is positive if y2() >= y1() and negative if y2() < y1().
 
     \sa dx()
 */
@@ -501,6 +503,7 @@ bool QLineF::isNull() const
 
     Sets the length of the line to the given \a length. QLineF will
     move the end point - p2() - of the line to give the line its new length.
+    If the given \a length is negative the angle() is also changed.
     
     If the line is a null line, the length will remain zero regardless
     of the length specified. 
@@ -757,7 +760,7 @@ QLineF::IntersectType QLineF::intersect(const QLineF &l, QPointF *intersectionPo
 
   \since 4.4
 
-  Returns the angle (in degrees) from this line to the given \a
+  Returns the angle (in positive degrees) from this line to the given \a
   line, taking the direction of the lines into account. If the lines
   do not intersect within their range, it is the intersection point of
   the extended lines that serves as origin (see
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index 764a1d6..1b8d330 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -469,9 +469,8 @@ void **QListData::erase(void **xi)
     \snippet doc/src/snippets/code/src_corelib_tools_qlistdata.cpp 0
 
     Qt includes a QStringList class that inherits QList\<QString\>
-    and adds a few convenience functions, such as QStringList::join()
-    and QStringList::find(). (QString::split() creates QStringLists
-    from strings.)
+    and adds a convenience function QStringList::join(). 
+    (QString::split() creates QStringLists from strings.)
 
     QList stores a list of items. The default constructor creates an
     empty list. To insert items into the list, you can use
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 754b16e..6cee897 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -9316,7 +9316,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         void *visual = QPaintDevice::x11AppVisual(screen);
     \newcode
-        void *visual = qApp->x11Info(screen).visual();
+        void *visual = widget->x11Info().appVisual(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9328,7 +9328,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         unsigned long colormap = QPaintDevice::x11AppColormap(screen);
     \newcode
-        unsigned long colormap = qApp->x11Info(screen).colormap();
+        unsigned long colormap = widget->x11Info().appColormap(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9340,7 +9340,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         Display *display = QPaintDevice::x11AppDisplay();
     \newcode
-        Display *display = qApp->x11Info().display();
+        Display *display = widget->x11Info().display();
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9352,7 +9352,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         int screen = QPaintDevice::x11AppScreen();
     \newcode
-        int screen = qApp->x11Info().screen();
+        int screen = widget->x11Info().appScreen();
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9364,7 +9364,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         int depth = QPaintDevice::x11AppDepth(screen);
     \newcode
-        int depth = qApp->x11Info(screen).depth();
+        int depth = widget->x11Info().appDepth(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9376,7 +9376,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         int cells = QPaintDevice::x11AppCells(screen);
     \newcode
-        int cells = qApp->x11Info(screen).cells();
+        int cells = widget->x11Info().appCells(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9388,7 +9388,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         unsigned long window = QPaintDevice::x11AppRootWindow(screen);
     \newcode
-        unsigned long window = qApp->x11Info(screen).appRootWindow();
+        unsigned long window = widget->x11Info().appRootWindow(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9400,7 +9400,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         bool isDefault = QPaintDevice::x11AppDefaultColormap(screen);
     \newcode
-        bool isDefault = qApp->x11Info(screen).defaultColormap();
+        bool isDefault = widget->x11Info().appDefaultColormap(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9412,7 +9412,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         bool isDefault = QPaintDevice::x11AppDefaultVisual(screen);
     \newcode
-        bool isDefault = qApp->x11Info(screen).defaultVisual();
+        bool isDefault = widget->x11Info().appDefaultVisual(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9432,7 +9432,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         bool isDefault = QPaintDevice::x11AppDpiX(screen);
     \newcode
-        bool isDefault = qApp->x11Info(screen).appDpiX();
+        bool isDefault = widget->x11Info().appDpiX(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
@@ -9444,7 +9444,7 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
     \oldcode
         bool isDefault = QPaintDevice::x11AppDpiY(screen);
     \newcode
-        bool isDefault = qApp->x11Info(screen).appDpiY();
+        bool isDefault = widget->x11Info().appDpiY(screen);
     \endcode
 
     \sa QWidget::x11Info(), QPixmap::x11Info()
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index 9d91a8f..7410d4c 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -453,7 +453,7 @@ void QNetworkDiskCache::updateMetaData(const QNetworkCacheMetaData &metaData)
 }
 
 /*!
-    Returns the current maximum size for the disk cache.
+    Returns the current maximum size in bytes for the disk cache.
 
     \sa setMaximumCacheSize()
  */
@@ -464,7 +464,7 @@ qint64 QNetworkDiskCache::maximumCacheSize() const
 }
 
 /*!
-    Sets the maximum size of the disk cache to be \a size.
+    Sets the maximum size of the disk cache to be \a size in bytes.
 
     If the new size is smaller then the current cache size then the cache will call expire().