summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2010-01-18 08:46:21 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2010-01-18 08:49:16 (GMT)
commit94ceaf333074a0f64aab4d1bbb2825591e3f147e (patch)
treef5d6643ed3c5c2a9ea1b039a629bb44333fdb669 /doc/src/snippets
parent67652ce2f2bd378862338daa3ebd9d7c43b4f91a (diff)
downloadQt-94ceaf333074a0f64aab4d1bbb2825591e3f147e.zip
Qt-94ceaf333074a0f64aab4d1bbb2825591e3f147e.tar.gz
Qt-94ceaf333074a0f64aab4d1bbb2825591e3f147e.tar.bz2
Describe patch-capabilities in the install instructions.
Task-number:QTBUG-7294 Reviewed-by:Gareth Stockwell
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/code/doc_src_installation.qdoc18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 7680ec8..b3c9903 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -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]