diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-20 09:49:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-20 09:49:38 (GMT) |
| commit | d7de938ee18192fbf83bb2b08519dd4ed50f04fa (patch) | |
| tree | 4a3742b57fde8d7f91ea3ee830a99f027a58e2a3 /doc/src/snippets/code/doc_src_installation.qdoc | |
| parent | 8721d060a67a01ac891cab9d3d17aacf7373bcf0 (diff) | |
| parent | 92e89ade291877a1146ca3e121fba5f491f61b84 (diff) | |
| download | Qt-d7de938ee18192fbf83bb2b08519dd4ed50f04fa.zip Qt-d7de938ee18192fbf83bb2b08519dd4ed50f04fa.tar.gz Qt-d7de938ee18192fbf83bb2b08519dd4ed50f04fa.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'doc/src/snippets/code/doc_src_installation.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index bc61702..b3c9903 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.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) ** @@ -222,3 +222,21 @@ abld build gcce urel //! [33] SYMBIANBUILD_DEPENDENCYOFF=1 //! [33] + +//! [34] +cd src\s60installs +patch_capabilities.pl Qt_template.pkg release-armv5 +make sis QT_SIS_OPTIONS=-i +cd ..\3rdparty\webkit\WebCore +patch_capabilities.pl QtWebkit_template.pkg release-armv5 +make sis QT_SIS_OPTIONS=-i +//! [34] + +//! [35] +cd src\s60installs +patch_capabilities.pl Qt_template.pkg release-armv5 "ALL -Tcb -AllFiles -DRM" +make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file> +cd ..\3rdparty\webkit\WebCore +patch_capabilities.pl QtWebKit_template.pkg release-armv5 "ALL -Tcb -AllFiles -DRM" +make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file> +//! [35] |