Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: Adding pages to the overviews and updating the index page.
  Doc: Updating pages and linking them to the overviews.

1 files changed, 6 insertions, 0 deletions

diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 8912490..d3c33d9 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -152,6 +152,7 @@
     \module QtOpenGL
     \title QtOpenGL Module
     \ingroup modules
+	\ingroup technology-apis
 
     \brief The QtOpenGL module offers classes that make it easy to
     use OpenGL in Qt applications.
@@ -202,6 +203,7 @@
     \title QtOpenVG Module
     \since 4.6
     \ingroup modules
+	\ingroup technology-apis
 
     \brief The QtOpenVG module is a plugin that provides support for
     OpenVG painting.
@@ -352,6 +354,8 @@
         \title QtSvg Module
         \since 4.1
         \ingroup modules
+		\ingroup technology-apis
+		\ingroup best-practices
 
         \brief The QtSvg module provides classes for displaying and creating SVG files.
 
@@ -400,6 +404,7 @@
     \module QtXml
     \title QtXml Module
     \ingroup modules
+	\ingroup technology-apis
 
     \brief The QtXml module provides a stream reader and writer for
     XML documents, and C++ implementations of SAX and DOM.
@@ -424,6 +429,7 @@
     \title QtXmlPatterns Module
     \since 4.4
     \ingroup modules
+	\ingroup technology-apis
 
     \brief The QtXmlPatterns module provides support for XPath,
     XQuery, XSLT and XML Schema validation.