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: (158 commits)
  qdoc: Yet another revision of the top doc page.
  Doc: Update on web template
  Added QDateTime::msecsTo()
  Doc: Fixed tables and images for the new docs
  qdoc: Yet another revision of the top doc page.
  Revert "Improve QUrl handling of local file paths"
  Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
  Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
  Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
  qdoc: Another revision of the top doc page.
  Doc correction to css
  Doc: Updates to the html template and javascript
  tst_SuiteTest: Fix a meaningless switch statement
  My 4.7.0 changelog entries.
  qdoc: Fixed annotated list generation to use <td>, not <th>.
  Doc: Tuning search script
  qdoc: Reorganized examples panel.
  Doc: Chages to search feature, css and table order
  QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
  QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively
  ...

1 files changed, 20 insertions, 0 deletions

diff --git a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
index 22ea240..e3ad483 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
@@ -67,3 +67,23 @@ beginInsertColumns(parent, 6, 8);
 //! [5]
 beginRemoveColumns(parent, 4, 6);
 //! [5]
+
+
+//! [6]
+beginMoveRows(sourceParent, 2, 4, destinationParent, 2);
+//! [6]
+
+
+//! [7]
+beginMoveRows(sourceParent, 2, 4, destinationParent, 6);
+//! [7]
+
+
+//! [8]
+beginMoveRows(parent, 2, 2, parent, 0);
+//! [8]
+
+
+//! [9]
+beginMoveRows(parent, 2, 2, parent, 4);
+//! [9]