Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public

Conflicts:
	mkspecs/common/symbian/symbian.conf
	src/gui/kernel/qapplication_s60.cpp

4 files changed, 6 insertions, 6 deletions

diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc
index 83d8679..c4eb615 100644
--- a/doc/src/development/assistant-manual.qdoc
+++ b/doc/src/development/assistant-manual.qdoc
@@ -182,7 +182,7 @@
     will appear. Click a sub-item to make its page appear in the \e{Documentation}
     window. Click on the control next to an open item to hide its sub-items.
     \o The \gui{Index} window is used to look up key words or phrases.
-    See \l{The One-Minute Guide to Using Qt Assistant} for how to use this
+    See \l{Qt Assistant Manual#The One-Minute Guide to Using Qt Assistant}{The One-Minute Guide to Using Qt Assistant} for how to use this
     window.
     \o The \gui{Bookmarks} window lists any bookmarks you have made. Double
     click a bookmark to make its page appear in the \e{Documentation} window.
diff --git a/doc/src/frameworks-technologies/qthelp.qdoc b/doc/src/frameworks-technologies/qthelp.qdoc
index 079b080..3c80f04 100644
--- a/doc/src/frameworks-technologies/qthelp.qdoc
+++ b/doc/src/frameworks-technologies/qthelp.qdoc
@@ -264,7 +264,7 @@
     help collection to keep track of a documentation set without relying
     on its file name. The Qt help system uses a namespace as identifier
     which is defined by the mandatory namespace tags. In the example
-    above, the namespace is "mycompany.com.myapplication.1_0".
+    above, the namespace is "mycompany.com.myapplication.1.0".
 
     \target Virtual Folders
     \section2 Virtual Folders
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 2582c4f..6b4ec61 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -648,10 +648,10 @@
     These examples show the use of graphics widgets and layouts.
 
     \list
-    \o \l{graphicsview/anchorlayouts}{Anchor Layouts}
+    \o \l{graphicsview/anchorlayout}{Anchor Layout}
     \o \l{graphicsview/flowlayout}{Flow Layout}
-    \o \l{graphicsview/simpleanchorlayouts}{Simple Anchor Layouts}
-    \o \l{graphicsview/weatheranchorlayouts}{Weather Anchor Layouts}
+    \o \l{graphicsview/simpleanchorlayout}{Simple Anchor Layout}
+    \o \l{graphicsview/weatheranchorlayout}{Weather Anchor Layout}
     \endlist
 
     Some examples demonstrate the use of graphics effects with canvas items.
diff --git a/doc/src/snippets/code/doc_src_qthelp.qdoc b/doc/src/snippets/code/doc_src_qthelp.qdoc
index 017879d..f7b880a 100644
--- a/doc/src/snippets/code/doc_src_qthelp.qdoc
+++ b/doc/src/snippets/code/doc_src_qthelp.qdoc
@@ -110,7 +110,7 @@ if (links.count()) {
 //! [7]
 <?xml version="1.0" encoding="UTF-8"?>
 <QtHelpProject version="1.0">
-    <namespace>mycompany.com.myapplication.1_0</namespace>
+    <namespace>mycompany.com.myapplication.1.0</namespace>
     <virtualFolder>doc</virtualFolder>	    
     <customFilter name="My Application 1.0">
         <filterAttribute>myapp</filterAttribute>