diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-18 12:23:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-18 12:23:32 (GMT) |
| commit | a764519a658031ce2fb375b659ff889b5241357f (patch) | |
| tree | 01f051450ddf844ea766a25fd6767fadacd77ed9 /doc/src/snippets/code | |
| parent | 437a67eb055c688ea4b778f5cfc9132fe02063c6 (diff) | |
| parent | 4e23d00dabc3465bd683d38ee147b3a9897b226f (diff) | |
| download | Qt-a764519a658031ce2fb375b659ff889b5241357f.zip Qt-a764519a658031ce2fb375b659ff889b5241357f.tar.gz Qt-a764519a658031ce2fb375b659ff889b5241357f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Workaround for compiler error with MWCC (Symbian emulator)
Describe patch-capabilities in the install instructions.
Remove qmake warning by using appropriate variable.
Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has changed /epoc32/include layout, including a subdirectory called "platform".
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 18 |
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] |