summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-11 17:38:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-11 17:38:51 (GMT)
commit9aaf834f9c31cb91cb7dd0693709e6754d836d85 (patch)
tree4233538be488ce0f5da713d7afeaf78da026e7d7 /doc/src
parent1e75074df0424f652c0ad1f28ef822a6a4b7d9f6 (diff)
parent898a85964830ac17e44675b75c6584866bcf767a (diff)
downloadQt-9aaf834f9c31cb91cb7dd0693709e6754d836d85.zip
Qt-9aaf834f9c31cb91cb7dd0693709e6754d836d85.tar.gz
Qt-9aaf834f9c31cb91cb7dd0693709e6754d836d85.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the perl download link and description in docs
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/getting-started/installation.qdoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index abdfcd2..561cc07 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -1023,9 +1023,11 @@ If you are using pre-built binaries, follow the instructions given in the
See \l{http://pepper.troll.no/s60prereleases/patches/}{here} for instructions how to check your
compiler version and how to patch it, if needed.
\endlist
- \o \l{http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.msi}{ActivePerl v5.6.1 build 638}
+ \o \l{http://downloads.activestate.com/ActivePerl/releases}{ActivePerl 5.6.1 build 638 or higher}
\list
- \o \bold{Note:} According to Symbian, version 5.6.1 build 638 is mandatory. Using later versions may result in unexplained errors.
+ \o \bold{Note:} According to Symbian, version 5.6.1 build 638 is mandatory for building Symbian applications,
+ but that version is no longer available from ActiveState. However, Qt for Symbian has been successfully
+ compiled using both 5.8.x and 5.10.x versions.
\endlist
\o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher}
\list