diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 14:04:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 14:04:12 (GMT) |
| commit | e1b4ac7eec876d80dc2984f192baa6295b027793 (patch) | |
| tree | 4a878dddd5491be7d2e99b90da0cbe4305273922 /doc/src/snippets/code | |
| parent | 497fdbb79178161e64059f64a98aa462eb6d4a80 (diff) | |
| parent | 709238ecfefdea82ec192267a4a33180078dbad8 (diff) | |
| download | Qt-e1b4ac7eec876d80dc2984f192baa6295b027793.zip Qt-e1b4ac7eec876d80dc2984f192baa6295b027793.tar.gz Qt-e1b4ac7eec876d80dc2984f192baa6295b027793.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:
Setting some parameters to reliably run on Tb9.2,
Streamlined smart installer package creation in Symbian
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index 9c00681..3b0cda1 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -475,19 +475,10 @@ default_deployment.pkg_prerules += supported_platforms //! [57] //! [58] -DEPLOYMENT.installer_header = 0xE2345678 -//! [58] - -//! [59] qmake make release-gcce -//! [59] - -//! [60] -make sis -ren wiggly_release-gcce.sis wiggly.sis -//! [60] +//! [58] -//! [61] -createpackage wiggly_installer.pkg -//! [61]
\ No newline at end of file +//! [59] +make installer_sis +//! [59]
\ No newline at end of file |