summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/doc_src_deployment.qdoc
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-02-10 15:50:55 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-02-10 15:50:55 (GMT)
commit1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed (patch)
treec22f6a63c2911d52ecc11aec8662d2f682d6afda /doc/src/snippets/code/doc_src_deployment.qdoc
parent492f1f4267074525e33fb8571c12d520e92163a6 (diff)
parentb7af368e86874d71ffc9071c9ef009814d6a3467 (diff)
downloadQt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.zip
Qt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.tar.gz
Qt-1b0c7a43624f378619ba4b5cc33fa3bfe4f531ed.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'doc/src/snippets/code/doc_src_deployment.qdoc')
-rw-r--r--doc/src/snippets/code/doc_src_deployment.qdoc13
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc
index 7eb8808..9c00681 100644
--- a/doc/src/snippets/code/doc_src_deployment.qdoc
+++ b/doc/src/snippets/code/doc_src_deployment.qdoc
@@ -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