summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/doc_src_installation.qdoc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-09-04 13:12:40 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-09-04 13:12:40 (GMT)
commite15ab744f15127422ef62a0b70e6cf129f52f48f (patch)
tree72352e1e297f0322610234c2eeb994820407616e /doc/src/snippets/code/doc_src_installation.qdoc
parent04802c1fe74439111c7bbe92fcb777dcbd618500 (diff)
parentb3b9813f1083fc556aea1f952329551da97aee90 (diff)
downloadQt-e15ab744f15127422ef62a0b70e6cf129f52f48f.zip
Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.gz
Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/snippets/code/doc_src_installation.qdoc')
-rw-r--r--doc/src/snippets/code/doc_src_installation.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index e84e188..e294c12 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -197,10 +197,10 @@ make release-armv5
//! [29]
cd src\s60installs
-make sisx QT_SISX_OPTIONS=-i QT_SISX_CERTIFICATE=<certificate file> QT_SISX_KEY=<certificate key file>
+make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file>
//! [29]
//! [30]
cd embedded\fluidlauncher
-make sisx QT_SISX_OPTIONS=-i
+make sis QT_SIS_OPTIONS=-i
//! [30]