diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-08-31 08:40:12 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-08-31 08:40:12 (GMT) |
| commit | 734badac98a81b6a1937dc94ac52839c52eee8a9 (patch) | |
| tree | 12419f5ce18c593a843c76ad57f1f3bce9526cf1 /doc/src/snippets/code | |
| parent | 68dc7ed9338eb555eb78d9993490434284bdc223 (diff) | |
| parent | 174bef24f10242b042dad626f8b68a95bdfb7ac7 (diff) | |
| download | Qt-734badac98a81b6a1937dc94ac52839c52eee8a9.zip Qt-734badac98a81b6a1937dc94ac52839c52eee8a9.tar.gz Qt-734badac98a81b6a1937dc94ac52839c52eee8a9.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')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_s60-introduction.qdoc | 16 |
2 files changed, 17 insertions, 5 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 68cd19a..6df0a1d 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -170,7 +170,7 @@ nmake //! [23] cd \Qt\%VERSION% -configure -platform win32-mwc -xplatform symbian-abld +configure -platform win32-g++ -xplatform symbian-abld //! [23] @@ -197,10 +197,10 @@ make release-armv5 //! [29] cd src\s60installs -createpackage -i qt_libs_armv5_urel.pkg <certificate file> <certificate key file> +make sisx QT_SISX_OPTIONS=-i QT_SISX_CERTIFICATE=<certificate file> QT_SISX_KEY=<certificate key file> //! [29] //! [30] cd embedded\fluidlauncher -createpackage -i fluidlauncher_armv5_urel.pkg +make sisx QT_SISX_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 ff1d159..fa9fd45 100644 --- a/doc/src/snippets/code/doc_src_s60-introduction.qdoc +++ b/doc/src/snippets/code/doc_src_s60-introduction.qdoc @@ -8,9 +8,21 @@ //! [1] //! [2] - createpackage wiggly_gcce_udeb.pkg + qmake + make debug-winscw release-armv5 + make sisx //! [2] //! [3] - createpackage -i wiggly_gcce_udeb.pkg + make sisx QT_SISX_TARGET=debug-armv5 //! [3] + +//! [4] + set QT_SISX_TARGET=debug-armv5 + make sisx +//! [4] + +//! [5] + set QT_SISX_OPTIONS=-i + make sisx +//! [5]
\ No newline at end of file |