diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-06 14:22:21 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-06 14:22:21 (GMT) |
| commit | a24d87f6469fa491624590383617b43c2b3dda32 (patch) | |
| tree | ee6a76cecf35e3f20951f5b13785aaaef12bbade /doc/src/snippets | |
| parent | da19e7f6b6b822f7a473c4eb2dff001a3434353a (diff) | |
| parent | 2f8e66b326c3d6748d530ab5abbf4fe5a91a6a3f (diff) | |
| download | Qt-a24d87f6469fa491624590383617b43c2b3dda32.zip Qt-a24d87f6469fa491624590383617b43c2b3dda32.tar.gz Qt-a24d87f6469fa491624590383617b43c2b3dda32.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index d4d96c5..7eb8808 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -476,12 +476,8 @@ default_deployment.pkg_prerules += supported_platforms //! [58] embedded_deployments = \ - "; Embed Open C dependencies" \ - "@\"$${EPOCROOT}nokia_plugin/openc/s60opencsis/pips_s60_1_6_SS.sis\",(0x20013851)" \ - "@\"$${EPOCROOT}nokia_plugin/openc/s60opencsis/openc_ssl_s60_1_6_SS.sis\",(0x200110CB)" \ - "@\"$${EPOCROOT}nokia_plugin/opencpp/s60opencppsis/STDCPP_s60_1_6_SS.sis\",(0x2000F866)" \ "; Embed Qt dependencies" \ - "@\"$$[QT_INSTALL_PREFIX]/qt_rndsigned.sis\",(0x2001E61C)" + "@\"$$[QT_INSTALL_PREFIX]/qt_installer.sis\",(0x2001E62D)" default_deployment.pkg_prerules += embedded_deployments //! [58] diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index a6f7ac1..7680ec8 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -198,6 +198,8 @@ make release-armv5 //! [29] cd src\s60installs make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file> +cd ..\3rdparty\webkit\WebCore +make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file> //! [29] //! [30] |