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: (27 commits)
  Added default countries for Mongolian and Nepali.
  Updated tst_qlocale autotest.
  Updated the 4.7.0 change log with my changes.
  Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 )
  doc: Fixed many broken links.
  doc: Fixed many broken links.
  doc: Fixed many broken links.
  qdoc: Set back to 3 cols for class list; we have a scrollbar now.
  Fix build on Mac OS X and Windows.
  Remove obsolete and broken qvfb skins.
  Only setup ICD test data when ICD is enabled.
  Doc: Fixed two diagrams and finally committed images for them.
  Make sure cursorPositionChanged is emitted when doing undo/redo
  Some more 4.7.0 changes
  Fix cosmetic issue in designer filter edits
  Doc: Adding support for IE 6, 7 and 8
  doc: Updated the widgets tutorial to work without page links.
  My 4.7.0 changes
  Added support for es_419 locale.
  Added Korean and Nynorsk locales support on Symbian.
  ...

1 files changed, 14 insertions, 3 deletions

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 03d535c..86915bb 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -294,9 +294,20 @@ QT_BEGIN_NAMESPACE
 
     This enum specifies the ownership when wrapping a C++ value, e.g. by using newQObject().
 
-    \value QtOwnership The standard Qt ownership rules apply, i.e. the associated object will never be explicitly deleted by the script engine. This is the default. (QObject ownership is explained in \l{Object Trees and Object Ownership}.)
-    \value ScriptOwnership The value is owned by the script environment. The associated data will be deleted when appropriate (i.e. after the garbage collector has discovered that there are no more live references to the value).
-    \value AutoOwnership If the associated object has a parent, the Qt ownership rules apply (QtOwnership); otherwise, the object is owned by the script environment (ScriptOwnership).
+    \value QtOwnership The standard Qt ownership rules apply, i.e. the
+    associated object will never be explicitly deleted by the script
+    engine. This is the default. (QObject ownership is explained in
+    \l{Object Trees & Ownership}.)
+
+    \value ScriptOwnership The value is owned by the script
+    environment. The associated data will be deleted when appropriate
+    (i.e. after the garbage collector has discovered that there are no
+    more live references to the value).
+
+    \value AutoOwnership If the associated object has a parent, the Qt
+    ownership rules apply (QtOwnership); otherwise, the object is
+    owned by the script environment (ScriptOwnership).
+
 */
 
 /*!