diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-14 23:37:12 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-14 23:37:12 (GMT) |
| commit | 0010cbdd14ce167857ae9eb8f539ad7b1205542a (patch) | |
| tree | 92d8b31cece70ad76abc867e3a34567a1e2c116c /doc/src/snippets/code/doc_src_deployment.qdoc | |
| parent | 9bca64fc5eee598f97eba1052f1db250c5c7e43b (diff) | |
| parent | 42dda19d82ceea48f19d356cfaf2b26acb763df8 (diff) | |
| download | Qt-0010cbdd14ce167857ae9eb8f539ad7b1205542a.zip Qt-0010cbdd14ce167857ae9eb8f539ad7b1205542a.tar.gz Qt-0010cbdd14ce167857ae9eb8f539ad7b1205542a.tar.bz2 | |
Merge branch 'master' of ../../qt/master
Diffstat (limited to 'doc/src/snippets/code/doc_src_deployment.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index 7eb8808..3b0cda1 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -475,18 +475,10 @@ 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 -//! [58] - -//! [59] qmake make release-gcce -//! [59] +//! [58] -//! [60] -make sis -//! [60]
\ No newline at end of file +//! [59] +make installer_sis +//! [59]
\ No newline at end of file |