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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits)
  qdoc: Avoid infinite loops in table of contents generation.
  Removed the documentation from the install rule.
  qdoc: Added the <othermeta> element.
  qdoc: Completed changing <section> structure.
  Doc: Fixed reference to absolete API in exceptionsafety.html
  Doc: Removed links to obsolete API in QResource
  Doc: Fixed broken links in QIcon::fromTheme()
  Doc: Fixed doc bug in undo framework example
  Doc: Fixed typo.
  qdoc: Changed <section> structure.
  Doc: Typo fixes
  Doc: Fixed snippet documenting QMetaObject::classInfo
  Doc: Cannot alter SelectionMode of a combobox's view
  qdoc: Added <publisher> and <permissions> elements.
  qdoc: Added <component> element to contain the module name.
  qdoc: Added <prodinfo> element and its contents to the metadata.
  Doc: Fixed a doc bug in the Rogue example
  Doc: Small change to QByteArray::resize()
  Doc: Small change to ListModel docs
  Doc: QtDemo now gives error message when example doc cannot be loaded
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 92067b9..58b51e5 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -32,7 +32,7 @@
 
 /*!
     \page model-view-programming.html
-        \ingroup qt-basic-concepts
+    \ingroup qt-basic-concepts
 
     \title Model/View Programming
     \brief A guide to Qt's extensible model/view architecture.
@@ -328,7 +328,7 @@
     contain a pointer to the model that created them, and this prevents
     confusion when working with more than one model.
 
-    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.cpp 0
 
     Model indexes provide \e temporary references to pieces of information, and
     can be used to retrieve or modify data via the model. Since models may
@@ -355,7 +355,7 @@
     item by specifying its row and column numbers to the model, and we receive
     an index that represents the item:
 
-    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.cpp 1
 
     Models that provide interfaces to simple, single level data structures like
     lists and tables do not need any other information to be provided but, as
@@ -371,7 +371,7 @@
     index that refers to an item of data by passing the relevant row and
     column numbers to the model.
 
-    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.cpp 2
 
     Top level items in a model are always referenced by specifying
     \c QModelIndex() as their parent item. This is discussed in the next
@@ -392,7 +392,7 @@
     about the item's parent. Outside the model, the only way to refer to an
     item is through a model index, so a parent model index must also be given:
 
-    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.cpp 3
 
     \table
     \row \i \inlineimage modelview-treemodel.png
@@ -403,12 +403,12 @@
 
     Items "A" and "C" are represented as top-level siblings in the model:
 
-    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 4
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.cpp 4
 
     Item "A" has a number of children. A model index for item "B" is
     obtained with the following code:
 
-    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 5
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.cpp 5
     \endtable
 
     \section3 Item roles
@@ -423,7 +423,7 @@
     corresponding to the item, and by specifying a role to obtain the type
     of data we want:
 
-    \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 6
+    \snippet doc/src/snippets/code/doc_src_model-view-programming.cpp 6
 
     \table
     \row \i \inlineimage modelview-roles.png