diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 18:58:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 18:58:27 (GMT) |
| commit | d499f265aa42231fd08df18213083aebe0db59ec (patch) | |
| tree | 272eac57285ae391a4538543c2d68b7ab7a245d6 /doc/src/snippets/code | |
| parent | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff) | |
| parent | 96a169ac3f235433906d58ac0e4c613f51c21bf3 (diff) | |
| download | Qt-d499f265aa42231fd08df18213083aebe0db59ec.zip Qt-d499f265aa42231fd08df18213083aebe0db59ec.tar.gz Qt-d499f265aa42231fd08df18213083aebe0db59ec.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:
My changes for 4.6.2
Fixed the location where bootstrap.sis is looked for.
Added support for smart installer package generation in Symbian
Flush the WSERV command buffer after deleting a surface.
Fix crash when multiple screens are reported from HAL.
Initial support for S60 softkey icons.
Revert "Daylight savings time for Symbian take 2"
Further bug fixes for enable/disables DEF files mechanism on Symbian
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 13 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 10 |
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 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 diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index b1cbc72..a48b53f 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] |