diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-18 19:00:43 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-18 19:00:43 (GMT) |
| commit | f62d047bf20cd45f78db14f1ef4f9ba7f7a7b131 (patch) | |
| tree | cf7b8d64fbc94504822096314f56a4a16a66bfa1 /doc/src/snippets/code | |
| parent | 7dee69caea20b189d5f4f8e27179c5abfd73a815 (diff) | |
| parent | a764519a658031ce2fb375b659ff889b5241357f (diff) | |
| download | Qt-f62d047bf20cd45f78db14f1ef4f9ba7f7a7b131.zip Qt-f62d047bf20cd45f78db14f1ef4f9ba7f7a7b131.tar.gz Qt-f62d047bf20cd45f78db14f1ef4f9ba7f7a7b131.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 18 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_properties.qdoc | 2 |
2 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 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] diff --git a/doc/src/snippets/code/doc_src_properties.qdoc b/doc/src/snippets/code/doc_src_properties.qdoc index 38cc139..962d930 100644 --- a/doc/src/snippets/code/doc_src_properties.qdoc +++ b/doc/src/snippets/code/doc_src_properties.qdoc @@ -112,7 +112,7 @@ MyClass *myinstance = new MyClass; QObject *object = myinstance; myinstance->setPriority(MyClass::VeryHigh); -object->setProperty("priority", (int)MyClass::VeryHigh); +object->setProperty("priority", "VeryHigh"); //! [6] |