summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/doc_src_deployment.qdoc
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-01-07 23:30:02 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-01-07 23:30:02 (GMT)
commit3f3e86d6fce5bb781bc41def35d0f15c58ef769c (patch)
treef79a0317d168a1961c11c2b8f3b772029e2902e1 /doc/src/snippets/code/doc_src_deployment.qdoc
parentdbbf451755d34be44f6b7ac2e7c03ffe5528fb1b (diff)
parenta3c1b0703575ed5fc364011c73dc104ecdb8ef0c (diff)
downloadQt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.zip
Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.tar.gz
Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-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.qdoc6
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]