Doc: Fixed qdoc warnings.v4.7.0-rc1

Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)

Conflicts:

	doc/src/index.qdoc
	src/dbus/qdbusconnection.cpp
	src/declarative/util/qdeclarativeanimation.cpp
	src/gui/s60framework/qs60mainapplication.cpp
	src/gui/s60framework/qs60mainappui.cpp
	src/network/access/qnetworkrequest.cpp

10 files changed, 15 insertions, 12 deletions

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index b25d00009c..ce35f26da9 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -27,7 +27,7 @@
 
 /*!
 \title Qt Quick
-\page declarativeui.html
+\page qtquick.html
 
 \brief Qt Quick provides a declarative framework for building highly
 dynamic, custom user interfaces.
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index 413eb59118..b4f4c83c93 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -48,7 +48,7 @@
   \endcode
 
   For more information on the Qt Declarative module, see the
-  \l{declarativeui.html}{Qt Quick} documentation.
+  \l{Qt Quick} documentation.
 */
 
 
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 68b66e1128..fb219fd819 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -559,7 +559,7 @@
     \example declarative/ui-components/dialcontrol
 
     This example shows how to create a dial-type control. It combines
-    \l Image elements with \l Rotation transforms and \l SpringAnimatino behaviors
+    \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors
     to produce an interactive speedometer-type dial.
 
     \image qml-dialcontrol-example.png
diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc
index c34f4af99a..790d5faca7 100644
--- a/doc/src/examples/simpletreemodel.qdoc
+++ b/doc/src/examples/simpletreemodel.qdoc
@@ -32,7 +32,7 @@
     The Simple Tree Model example shows how to create a basic, read-only
     hierarchical model to use with Qt's standard view classes. For a
     description of simple non-hierarchical list and table models, see the
-    \l{model-view-programming.html}{Model/View Programming} overview.
+    \l{Model/View Programming} overview.
 
     \image simpletreemodel-example.png
 
@@ -40,7 +40,7 @@
     information in a data source, using an abstract model of the data to
     simplify and standardize the way it is accessed. Simple models represent
     data as a table of items, and allow views to access this data via an
-    \l{model-view-model.html}{index-based} system. More generally, models can
+    \l{Model/View Programming#Models}{index-based} system. More generally, models can
     be used to represent data in the form of a tree structure by allowing each
     item to act as a parent to a table of child items.
 
diff --git a/doc/src/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc
index 49e329581d..48e4bfa51f 100644
--- a/doc/src/examples/spinboxdelegate.qdoc
+++ b/doc/src/examples/spinboxdelegate.qdoc
@@ -42,8 +42,8 @@
     \image spinboxdelegate-example.png
 
     This concepts behind this example are covered in the
-    \l{model-view-delegate.html}{Delegate Classes} chapter of the
-    \l{model-view-programming.html}{Model/View Programming} overview.
+    \l{Model/View Programming#Delegate Classes}{Delegate Classes} chapter of the
+    \l{Model/View Programming} overview.
 
     \section1 SpinBoxDelegate Class Definition
 
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 61c9da2b50..de6bafb799 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -416,5 +416,5 @@
 
 /*!
     \externalpage http://opensource.org/licenses/bsd-license.php
-    \title BSD License
+    \title New and Modified BSD Licenses
 */
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e45892fabc..bd8e4ad4f5 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -72,7 +72,7 @@
                     <li><a href="technology-apis.html">Qt and Key Technologies</a></li>
                     <li><a href="best-practices.html">Best Practices Guides</a></li>
                </ul>
-              </div>
+             </div>
               <div class="sectionlist">
                 <ul>
                     <li><a href="qtquick.html">Qt Quick</a></li>
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index a81bfb2256..c51fcad3a2 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -116,7 +116,6 @@
 
 /*!
     \module QtMultimedia
-    \page qtmultimedia-module.html
     \title QtMultimedia Module
     \contentspage All Modules
     \previouspage QtCore
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index a1773a34a2..c7b88cfb6f 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -55,8 +55,7 @@
 
     These pages are about Qt's traditional set of GUI components for
     building both native look ^ feel and custom UI's for the desktop
-    environment. Use \l {declarativeui.html} {Qt Quick} for building 
-    UI's for mobile devices.
+    environment. Use \l{Qt Quick} for building UI's for mobile devices.
 
     \generatelist {related}
  */
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index 89d564f495..c8a43b7bde 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -234,3 +234,8 @@
     \externalpage http://qt.gitorious.org
     \title Public Qt Repository
 */
+
+/*!
+    \externalpage http://get.qt.nokia.com/nokiasmartinstaller/
+    \title Smart Installer
+*/