diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-09-03 10:19:11 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-09-03 10:19:11 (GMT) |
| commit | 75078d7b20155ba192b88ec54008e07d1ee44676 (patch) | |
| tree | e170f474aaed28d2476dc2d134f3be27e76c3741 /doc/src/snippets/code | |
| parent | 0dcf114697309f3f23f9717b608fa2be1813fe94 (diff) | |
| parent | f55a2e6b2b3d97e74c3368552a6fba412d86e0b9 (diff) | |
| download | Qt-75078d7b20155ba192b88ec54008e07d1ee44676.zip Qt-75078d7b20155ba192b88ec54008e07d1ee44676.tar.gz Qt-75078d7b20155ba192b88ec54008e07d1ee44676.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_s60-introduction.qdoc | 12 |
2 files changed, 8 insertions, 8 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] diff --git a/doc/src/snippets/code/doc_src_s60-introduction.qdoc b/doc/src/snippets/code/doc_src_s60-introduction.qdoc index fa9fd45..09ea359 100644 --- a/doc/src/snippets/code/doc_src_s60-introduction.qdoc +++ b/doc/src/snippets/code/doc_src_s60-introduction.qdoc @@ -10,19 +10,19 @@ //! [2] qmake make debug-winscw release-armv5 - make sisx + make sis //! [2] //! [3] - make sisx QT_SISX_TARGET=debug-armv5 + make sis QT_SIS_TARGET=debug-armv5 //! [3] //! [4] - set QT_SISX_TARGET=debug-armv5 - make sisx + set QT_SIS_TARGET=debug-armv5 + make sis //! [4] //! [5] - set QT_SISX_OPTIONS=-i - make sisx + set QT_SIS_OPTIONS=-i + make sis //! [5]
\ No newline at end of file |