diff options
| author | Bill King <bking@trolltech.com> | 2010-01-12 02:45:18 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-01-12 02:45:18 (GMT) |
| commit | 82e9af930bea96710d7df87f03d3f4f1a175dbd3 (patch) | |
| tree | 98f789486ad1488fb96b142e0273d86423563ae2 /doc/src/snippets/code/doc_src_deployment.qdoc | |
| parent | 2e5f0b28e9eebd372bed923e8e41e805918647b0 (diff) | |
| parent | 8d76de98d93421395306941e59d136f1e7395d15 (diff) | |
| download | Qt-82e9af930bea96710d7df87f03d3f4f1a175dbd3.zip Qt-82e9af930bea96710d7df87f03d3f4f1a175dbd3.tar.gz Qt-82e9af930bea96710d7df87f03d3f4f1a175dbd3.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'doc/src/snippets/code/doc_src_deployment.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 6 |
1 files changed, 1 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] |