diff options
| author | Bill King <bking@trolltech.com> | 2010-02-09 06:11:09 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-02-09 06:11:09 (GMT) |
| commit | 3318d412cb78a545790761161f243cb49da4abb7 (patch) | |
| tree | 62d6612926f7bbcce8a1a28cbdb1a382339aa566 /doc/src/snippets/code/doc_src_deployment.qdoc | |
| parent | 7370dceadf969288a22c564728398cc7cb119d82 (diff) | |
| parent | 72f3caa5d7821b93a4e807fb61c5cda9f2c6f393 (diff) | |
| download | Qt-3318d412cb78a545790761161f243cb49da4abb7.zip Qt-3318d412cb78a545790761161f243cb49da4abb7.tar.gz Qt-3318d412cb78a545790761161f243cb49da4abb7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'doc/src/snippets/code/doc_src_deployment.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index 8211abe..9c00681 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -475,11 +475,7 @@ default_deployment.pkg_prerules += supported_platforms //! [57] //! [58] -embedded_deployments = \ - "; Embed Qt dependencies" \ - "@\"$$[QT_INSTALL_PREFIX]/qt_installer.sis\",(0x2001E62D)" - -default_deployment.pkg_prerules += embedded_deployments +DEPLOYMENT.installer_header = 0xE2345678 //! [58] //! [59] @@ -489,4 +485,9 @@ make release-gcce //! [60] make sis -//! [60]
\ No newline at end of file +ren wiggly_release-gcce.sis wiggly.sis +//! [60] + +//! [61] +createpackage wiggly_installer.pkg +//! [61]
\ No newline at end of file |