diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-03 06:37:18 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-03 06:37:18 (GMT) |
| commit | ba7fdc51a2cc0792ceeaf51edce7863c94d96249 (patch) | |
| tree | d05b7577e240656e3fe15b987ac9f695e6fe9aa9 /doc/src/snippets/code/doc_src_deployment.qdoc | |
| parent | 0a903bf4995ed65367eb17c024af3f16aef57510 (diff) | |
| parent | 350b0fadf3fbd12a278681513295577a066b0fb1 (diff) | |
| download | Qt-ba7fdc51a2cc0792ceeaf51edce7863c94d96249.zip Qt-ba7fdc51a2cc0792ceeaf51edce7863c94d96249.tar.gz Qt-ba7fdc51a2cc0792ceeaf51edce7863c94d96249.tar.bz2 | |
Merge commit '350b0fadf3fbd12a278681513295577a066b0fb1' into remove-manual-test
Diffstat (limited to 'doc/src/snippets/code/doc_src_deployment.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index 2d6a78f..7eb8808 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -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] |