diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-06 08:55:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-06 08:55:46 (GMT) |
| commit | b0fd5e82c0d7d62a01cce2c1cdcb925bc5a34182 (patch) | |
| tree | ca684ffa4016676edcd9fde83d99ed8242147e4e /doc/src/snippets/code | |
| parent | 4c486619517cea4012a157995bce197c817d83e5 (diff) | |
| parent | 66275bc468339ec2599ba660b728304858e30b39 (diff) | |
| download | Qt-b0fd5e82c0d7d62a01cce2c1cdcb925bc5a34182.zip Qt-b0fd5e82c0d7d62a01cce2c1cdcb925bc5a34182.tar.gz Qt-b0fd5e82c0d7d62a01cce2c1cdcb925bc5a34182.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:
Fixed Symbian application deployment instructions
Fixed "run" makefile target documentation for Symbian
Minor logic fix to Symbian generator in qmake
Deal with test cases that crash or hang
Updated sis file names and related content in Symbian installation docs
Diffstat (limited to 'doc/src/snippets/code')
| -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 2d6a78f..8211abe 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 c810706..bc61702 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] |