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: (72 commits)
  Doc: Enabled the context menu in the spreadsheet demo.
  Updated URLs.
  Doc: Applied suggestion for an improvement to the foreach documentation.
  Doc: Added a note about the lack of standard file copy/paste on X11.
  Doc: Fixed the row number for a widget in two parts of the tutorial.
  Doc: Fixed typos.
  Reduce compiling time of QScriptValue autotest suite on Windows.
  Optimize QScriptValue autotest generator.
  Set database write behavior to synchronous=OFF and increase page cache.
  doc: Fixed some qdoc errors.
  Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
  Allow building documentation without all of Qt
  Added a documentation for the new enum value in gesture api.
  Remove the OBJECTS_DIR variable assignment from some projets in Qt.
  Fix compile
  qmake/MinGw: Link statically for Qt Creator to be able to detect it.
  Enable two fast path for blend_tiled_rgb565
  Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
  Make QLabel::text a reloadable property
  remove non wifi interfaces from being handled.
  ...

3 files changed, 9 insertions, 5 deletions

diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index c60847e..6901947 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -128,7 +128,7 @@
   \brief A URL is a resource locator, like a file name. 
 
   A URL is a resource locator, like a file name.  It can be either
-  absolute, e.g. "http://qtsoftware.com", or relative, e.g.
+  absolute, e.g. "http://qt.nokia.com", or relative, e.g.
   "pics/logo.png". A relative URL is resolved relative to the URL of
   the component where the URL is converted from a JavaScript string
   expression to a url property value.
diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc
index 86920fd..505b65c 100644
--- a/doc/src/frameworks-technologies/containers.qdoc
+++ b/doc/src/frameworks-technologies/containers.qdoc
@@ -612,11 +612,14 @@
 
     Qt automatically takes a copy of the container when it enters a
     \c foreach loop. If you modify the container as you are
-    iterating, that won't affect the loop. (If you don't modify the
+    iterating, that won't affect the loop. (If you do not modify the
     container, the copy still takes place, but thanks to \l{implicit
-    sharing} copying a container is very fast.) Similarly, declaring
-    the variable to be a non-const reference, in order to modify the
-    current item in the list will not work either.
+    sharing} copying a container is very fast.)
+
+    Since foreach creates a copy of the container, using a non-const
+    reference for the variable does not allow you to modify the original
+    container. It only affects the copy, which is probably not what you
+    want.
 
     In addition to \c foreach, Qt also provides a \c forever
     pseudo-keyword for infinite loops:
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 9e1d340..76a52b4 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -130,6 +130,7 @@
 
 /*!
     \module QtMultimedia
+    \page qtmultimedia-module.html
     \title QtMultimedia Module
     \contentspage All Qt Modules
     \previouspage QtCore