diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 20:29:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 20:29:20 (GMT) |
| commit | c46c06d363b7c90fecd84e7ef333ffa449f1d71c (patch) | |
| tree | 17462ee1282075a748fa84ca0a0feca3e2c588a0 /doc | |
| parent | 766791963b91bea53867381f04f72d356382a81b (diff) | |
| parent | ef84739c3737d03da9de2b5e92a68f70294c65d3 (diff) | |
| download | Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.zip Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.tar.gz Qt-c46c06d363b7c90fecd84e7ef333ffa449f1d71c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix qmake.pro after Symbian alternate build system integration
Fix compile error
Don't try to use so much permissions, use something a lot more sane
A bit saner suggestion
Remove not needed permissions
Make compile on Symbian
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 2 |
1 files changed, 1 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 d9e5d3c..5789662 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -886,7 +886,7 @@ TARGET.CAPABILITY += AllFiles //! [133] //! [134] -TARGET.CAPABILITY = ALL -TCB +TARGET.CAPABILITY = ALL -TCB -DRM -AllFiles //! [134] //! [135] |