diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-01-05 12:37:42 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-06 14:27:21 (GMT) |
| commit | 16c18a3696e45458c8893950f9d4a44b8fe95eca (patch) | |
| tree | b04de5169ddaed724400a4284fc500c8ab348680 | |
| parent | dc8a726ffa08bab6851e3f62a83fba969f5a5845 (diff) | |
| download | Qt-16c18a3696e45458c8893950f9d4a44b8fe95eca.zip Qt-16c18a3696e45458c8893950f9d4a44b8fe95eca.tar.gz Qt-16c18a3696e45458c8893950f9d4a44b8fe95eca.tar.bz2 | |
Fixed Symbian application deployment instructions
Obsolete sis files were referenced.
Task-number: QTBUG-6601
Reviewed-by: Janne Koskinen
(cherry picked from commit 66275bc468339ec2599ba660b728304858e30b39)
| -rw-r--r-- | doc/src/deployment/deployment.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index edc4df1..bb21765 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -1567,12 +1567,12 @@ By default \c .pkg file generated by \c qmake adds support for all S60 3rd edition FP1, S60 3rd edition FP2 and S60 5th edition devices. - As a last step we will embed the Open C, Open C++ and Qt \c .sis files to the Wiggly + As a last step we will embed the \c qt_installer.sis file to the Wiggly deployment file: \snippet doc/src/snippets/code/doc_src_deployment.qdoc 58 - By embedding all dependencies to the application deployment file, the + When \c qt_installer.sis is embedded to the application deployment file, the end-user does not need to download and install all dependencies separately. The drawback of \c .sis embedding is that the application \c .sis file size becomes big. To address these problems Forum Nokia is planning to release a smart installer diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index ef0ba6e..69adc82 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] |