diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 07:50:25 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 07:50:25 (GMT) |
| commit | 43cf31a43a5359c83b7851554f6df5fe75e1c285 (patch) | |
| tree | cadc091db0cf1546b1fbe94b275692964d8a9d91 /doc/src/snippets/code | |
| parent | 10e3f11057218dac621087980bc37db464838941 (diff) | |
| parent | b1fb9651145560803aec7408aebba2c0be5823de (diff) | |
| download | Qt-43cf31a43a5359c83b7851554f6df5fe75e1c285.zip Qt-43cf31a43a5359c83b7851554f6df5fe75e1c285.tar.gz Qt-43cf31a43a5359c83b7851554f6df5fe75e1c285.tar.bz2 | |
Merge branch 'master' 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 |