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: (32 commits)
  Fix memory leak in QtScript variable object
  doc: Changed some titles so lists of contents sort better.
  QSslSocket: fix security vulnerability with wildcard IP addresses
  doc: Some reorganization of top page topic hierarchy.
  Mac: Fix crash when using style to draw on other things than widgets
  Doc: Adding radius support for CSS3 and webkit
  Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
  add performance comparisons to qregexp benchmark
  configure: fix error message when calling config.status
  Fix invalid memory write during recursive timer activation
  Added comment about calendarPopup in setCalendarWidget function documentation.
  doc: Fixed some qdoc errors.
  Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
  CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
  XmlListModel doc fixes
  Mention QML_IMPORT_TRACE in Modules docs
  Merge sections about when property and default state
  Explain Flipable example further
  PathView required some diagonal movement before a drag was initiated.
  doc: Fixed some qdoc errors.
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 0e3a8d3..af35316 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2914,8 +2914,9 @@ int qrand()
     \relates <QtGlobal>
 
     You can use this macro to specify information about a custom type
-    \a Type. With accurate type information, Qt's \l{generic
-    containers} can choose appropriate storage methods and algorithms.
+    \a Type. With accurate type information, Qt's \l{Container Classes}
+    {generic containers} can choose appropriate storage methods and
+    algorithms.
 
     \a Flags can be one of the following: