summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-11-01 12:47:15 (GMT)
committerCasper van Donderen <casper.vandonderen@nokia.com>2011-11-01 13:10:47 (GMT)
commit511ebd56ee288f0860dd4fdcceac44cd78ea3f7c (patch)
tree0c37847928810aa8b5311118d9d4dcff238b2b7c /doc
parentc462a2e950df19e6a5ef4d034917fddf49385fe0 (diff)
downloadQt-511ebd56ee288f0860dd4fdcceac44cd78ea3f7c.zip
Qt-511ebd56ee288f0860dd4fdcceac44cd78ea3f7c.tar.gz
Qt-511ebd56ee288f0860dd4fdcceac44cd78ea3f7c.tar.bz2
Invalid links to http://developer.symbian.org
Fixed "SBSv2" and "Installing qt for the Symbian platform" links from the installation.qdoc. Fixed platform security link from the external-resources.qdoc. Task-numbers: QTBUG-18313, QTBUG-18313, QTBUG-11312 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/external-resources.qdoc2
-rw-r--r--doc/src/getting-started/installation.qdoc4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index f528bf2..f81f517 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -420,7 +420,7 @@
*/
/*!
- \externalpage http://developer.symbian.org/wiki/index.php/Platform_Security_%28Fundamentals_of_Symbian_C%2B%2B%29#Self-Signed_Applications
+ \externalpage http://www.developer.nokia.com/Community/Wiki/Qt_&_Symbian_Platform_Security
\title Symbian Platform Security
*/
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 239f117..a4ae63f 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -590,7 +590,7 @@ the Symbian platform from scratch.
The \l{Configuration Options for Qt} page gives a brief overview
of these.
- SBSv2 (also known as \l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor})
+ SBSv2 (also known as \l{http://projects.developer.nokia.com/raptor/wiki} {Raptor})
is a next-generation Symbian build system. SBSv2 is not officially supported
by any of the S60 SDKs currently available from Forum Nokia.
@@ -1348,7 +1348,7 @@ We hope you will enjoy using Qt.
\endlist
- We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start}
+ We recommend you to take a look at \l{http://doc.qt.nokia.com/latest/install-symbian.html}{Installing Qt for the Symbian platform}
to get more information about how to setup the development environment.
\sa {Known Issues}