summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-04 13:08:44 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-02-05 14:10:09 (GMT)
commitd1d27abb114357845041b13f04412d0c54b80f6b (patch)
tree9b2163e4b60f8e65d69b4e73e40d7ad5b4248d9a /doc/src/snippets/code
parent4bf17a4a3046753448e502e139d0f3657a2027f9 (diff)
downloadQt-d1d27abb114357845041b13f04412d0c54b80f6b.zip
Qt-d1d27abb114357845041b13f04412d0c54b80f6b.tar.gz
Qt-d1d27abb114357845041b13f04412d0c54b80f6b.tar.bz2
Added support for smart installer package generation in Symbian
Smart installer packages bundle normal application sis with a bootstrap package that will download a smart installer when the package is installed. Smart installer in turn will download any dependencies of the application that are available on remote server, such as Open C, Qt, and QtWebkit packages, and install them Smart installer packages are generated when DEPLOYMENT.installer_header variable is defined in applicatoin .pro file. This commit is still missing properly signed bootstrap.sis package. Task-number: QTBUG-7908 Reviewed-by: Shane Kearns (cherry picked from commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976)
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/doc_src_deployment.qdoc13
-rw-r--r--doc/src/snippets/code/doc_src_qmake-manual.qdoc10
2 files changed, 12 insertions, 11 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc
index cfc38af..96041a8 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
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 9e7aa26..04dd731 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -963,9 +963,9 @@ RSS_RULES += myrssrules
//! [145]
//! [146]
-BLD_INF_RULES.prj_exports += \
- "$${LITERAL_HASH}include <platform_paths.hrh>" \
- "rom/my.iby APP_LAYER_PUBLIC_EXPORT_PATH(my.iby)" \
- "inc/myheader.h mycomp/myheader.h" \
- ":zip my_api.zip my_api"
+DEPLOYMENT.installer_header = 0x12345678
//! [146]
+
+//! [147]
+DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0"
+//! [147]