diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-30 11:04:01 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-30 11:04:01 (GMT) |
| commit | ff968f44124322f5cda47cc7eced79ccaf23de80 (patch) | |
| tree | e957f1a602b1518aba9a24fb4553b18b6b85a8ec /doc/src/snippets/code/doc_src_deployment.qdoc | |
| parent | 2d9260e863ff2e3a5bb77d37b2b9b90072bce825 (diff) | |
| parent | 08072b17a19bf9a99fbc8a494baa5528725fec1a (diff) | |
| download | Qt-ff968f44124322f5cda47cc7eced79ccaf23de80.zip Qt-ff968f44124322f5cda47cc7eced79ccaf23de80.tar.gz Qt-ff968f44124322f5cda47cc7eced79ccaf23de80.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/snippets/code/doc_src_deployment.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index 3b0cda1..48e9ac6 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -463,7 +463,8 @@ vendorinfo = \ "%{\"Example Localized Vendor\"}" \ ":\"Example Vendor\"" -default_deployment.pkg_prerules = vendorinfo +my_deployment.pkg_prerules = vendorinfo +DEPLOYMENT += my_deployment //! [56] //! [57] @@ -471,7 +472,9 @@ supported_platforms = \ "; This demo only supports S60 5.0" \ "[0x1028315F],0,0,0,{\"S60ProductID\"}" -default_deployment.pkg_prerules += supported_platforms +default_deployment.pkg_prerules -= pkg_platform_dependencies +my_deployment.pkg_prerules += supported_platforms +DEPLOYMENT += my_deployment //! [57] //! [58] |