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/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index ad71836..2fd66eb 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -595,7 +595,7 @@ QDebug operator<<(QDebug dbg, const QQuaternion &q)
     Writes the given \a quaternion to the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &stream, const QQuaternion &quaternion)
@@ -612,7 +612,7 @@ QDataStream &operator<<(QDataStream &stream, const QQuaternion &quaternion)
     Reads a quaternion from the given \a stream into the given \a quaternion
     and returns a reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &stream, QQuaternion &quaternion)