Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  add autotest for QString::setRawData()
  Fixed case of a library file name to enable MinGW builds on Fedora.
  Doc: Made Qt::TextLongestVariant internal again.
  Doc: Fixed minor documentation issues.
  Doc: Reorganized the platform and compiler notes pages.
  Doc: Removed non-ASCII characters and reformatted the text.
  Doc: Fixed documentation style and qdoc warnings.
  Doc: Fixed qdoc warnings.
  Doc: Fixed qdoc warnings.
  Doc: Fixed snippet reference for the Getting Started QML guide.
  Doc: Fixed warnings caused by an earlier change. Made docs consistent.
  Doc: Fixed warnings caused by an earlier change. Made docs consistent.
  Doc: Renamed an external reference to work around an auto-linking issue.
  Doc: Fixed qdoc warnings.
  Doc: Fixed links to the online BSD license information.
  Doc: Fixed qdoc warnings.
  Doc: Re-added a link to the Qt site related to testing tools.
  Doc: Marked some new properties as internal for now.
  Doc: Renamed a project file.
  Doc: Added missing examples and snippets.

1 files changed, 6 insertions, 6 deletions

diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 8932747..7bc5303 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -29,7 +29,7 @@
     \group qtsymbian
     \title Qt for the Symbian platform
     \ingroup qt-embedded
-    \brief Documents related to Qt on the Symbian platform
+    \brief Documents related to Qt for the Symbian platform
 
     Qt for Symbian is a C++ framework for GUI and application development
     for embedded devices running Symbian. Qt for Symbian provides all
@@ -42,14 +42,14 @@
     \o
      \list
         \o \l {Qt for the Symbian platform Requirements}
-        \o \l {Installing Qt on the Symbian platform from a Binary Package}
-        \o \l {Installing Qt on the Symbian platform}
+        \o \l {Installing Qt for the Symbian platform from a Binary Package}
+        \o \l {Installing Qt for the Symbian platform}
         \o \l {The Symbian platform - Introduction to Qt}{Introduction to using Qt}
     \endlist
     \o
     \list
         \o \l {Exception Safety with Symbian}
-        \o \l {Platform Notes - Symbian} {Qt for the Symbian platform - state of support}
+        \o \l {Platform and Compiler Notes - Symbian} {Qt for the Symbian platform - state of support}
         \o \l {qmake Platform Notes#Symbian platform} {Qt for Symbian extensions for qmake}
 	\o \l {Symbian Platform Security Requirements} {Symbian Platform Security Requirements}
     \endlist
@@ -93,10 +93,10 @@
 
     \section1 Installing Qt and Running Demos
 
-    Follow the instructions found in \l{Installing Qt on the Symbian platform from a Binary Package}
+    Follow the instructions found in \l{Installing Qt for the Symbian platform from a Binary Package}
     to learn how to install Qt using a binary package and how to build and run Qt demos.
 
-    Follow the instructions found in \l{Installing Qt on the Symbian platform} to learn how to install Qt using
+    Follow the instructions found in \l{Installing Qt for the Symbian platform} to learn how to install Qt using
     using source package and how to build and run the Qt demos.
 
     \section1 Building Your Own Applications