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: (50 commits)
  Dont crash when assigning the same input context twice.
  Fixed a typo in variable name in qlocale data generator.
  Fix for Norwegian and Korean languages on symbian.
  Remove unused function in QDBusConnectionPrivate
  Doc: Fixing bugs in HTML generator
  Updating 4.7.0 change log.
  Doc: Correcting style to class lists
  qdoc: Improved class index page.
  Added MSVC 2010 project files to .gitignore
  Fix architecture detection on GNU/Hurd.
  Revert "tst_bic: make it possible to test for cross-compilation"
  fix typo in documentation
  Improve Bearer Management related documentation in QNetworkAccessManager
  Compile with QT_NO_ACTION.
  Unbreak compilation outside Mac
  QDBusAbstractInterface: don't set lastError outside the object's own thread
  tst_bic: make it possible to test for cross-compilation
  Remove Q_PACKED from QChar and QLocale::Data.
  QDebug operator for QFlags
  Removing unneeded qDebug statement.
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index 4c80325..0e06f34 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -2199,7 +2199,7 @@ void QTreeWidgetItem::executePendingSort() const
 
     This operator uses QTreeWidgetItem::write().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item)
 {
@@ -2214,7 +2214,7 @@ QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item)
 
     This operator uses QTreeWidgetItem::read().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator>>(QDataStream &in, QTreeWidgetItem &item)
 {