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_qmake-manual.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_qmake-manual.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index 36676ae..d9e5d3c 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -933,7 +933,9 @@ DEPLOYMENT += somelib justdep //! [140] //! [141] -default_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}" +default_deployment.pkg_prerules -= pkg_platform_dependencies +my_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}" +DEPLOYMENT += my_deployment //! [141] //! [142] |