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: (39 commits)
  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.
  Fixing incorrect addition of public API symbols.
  Removal erroneous inclusion of new Public API in qmacstyle.
  Doc: design changes
  qdoc: Fixed html error, but the problem is still there.
  qdoc: Changed number of columns to 1. Oila!
  Doc: Changes to the HTMLGenerator, style and js
  remove dead code that will never get called.
  add bytes and activeTime to corelwan.
  Fix formating of license header.
  fix irix build
  clarify wording of warning message
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 36abc10..4a96a39 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -959,7 +959,7 @@ applications using Qt for Symbian can start right away.}
         \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=0baf2b35-c656-4969-ace8-e4c0c0716adb&DisplayLang=en}{here}.
     \endlist
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
 
 /*!
@@ -969,7 +969,7 @@ applications using Qt for Symbian can start right away.}
     \brief Setting up the Mac OS X environment for Qt.
     \previouspage General Qt Requirements
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
 
 /*!
@@ -1108,7 +1108,7 @@ applications using Qt for Symbian can start right away.}
     distributions; try searching for \c gstreamer or \c libgstreamer in your
     distribution's package repository to find suitable packages.
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
 
 /*!
@@ -1162,7 +1162,7 @@ applications using Qt for Symbian can start right away.}
     information on Windows CE Customization can be found
     \l{Windows CE - Working with Custom SDKs}{here}.
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
 
 /*!
@@ -1172,7 +1172,7 @@ applications using Qt for Symbian can start right away.}
     \brief Setting up the Embedded Linux environment for Qt.
     \previouspage General Qt Requirements
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 
     \section1 Building Qt for Embedded Linux with uclibc
 
@@ -1272,5 +1272,5 @@ applications using Qt for Symbian can start right away.}
     We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start}
     to get more information about how to setup the development environment.
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */