Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend

Conflicts:
	src/script/qscriptextqobject.cpp

1 files changed, 11 insertions, 4 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
index e5eb308..1c1c72a 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
@@ -32,7 +32,6 @@
 
 /*!
   \class QWebHistoryItem
-  \ingroup explicitly-shared
   \since 4.4
   \brief The QWebHistoryItem class represents one item in the history of a QWebPage
 
@@ -52,13 +51,17 @@
   \row    \o userData()    \o The user specific data that was stored with the history item.
   \endtable
 
-  \note QWebHistoryItem objects are value based and \l{explicitly shared}.
+  \note QWebHistoryItem objects are value based, but \e{explicitly shared}. Changing
+  a QWebHistoryItem instance by calling setUserData() will change all copies of that
+  instance.
 
   \sa QWebHistory, QWebPage::history(), QWebHistoryInterface
 */
 
 /*!
-  Constructs a history item from \a other.
+  Constructs a history item from \a other. The new item and \a other
+  will share their data, and modifying either this item or \a other will
+  modify both instances.
 */
 QWebHistoryItem::QWebHistoryItem(const QWebHistoryItem &other)
     : d(other.d)
@@ -66,7 +69,9 @@ QWebHistoryItem::QWebHistoryItem(const QWebHistoryItem &other)
 }
 
 /*!
-  Assigns the \a other history item to this.
+  Assigns the \a other history item to this. This item and \a other
+  will share their data, and modifying either this item or \a other will
+  modify both instances.
 */
 QWebHistoryItem &QWebHistoryItem::operator=(const QWebHistoryItem &other)
 {
@@ -163,6 +168,8 @@ QVariant QWebHistoryItem::userData() const
   \since 4.5
 
  Stores user specific data \a userData with the history item.
+ 
+ \note All copies of this item will be modified.
 
  \sa userData()
 */