summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-13 00:06:01 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-13 00:06:01 (GMT)
commit921f54e051b6fcc0268097347e2ad13ba0bfc37d (patch)
tree6e50255fba62b11ede89b3b954db35a634162154 /doc
parente9a0067ef4b272f1893522959dc15561970590ea (diff)
parenta24921ff976a07cc36c0f2edd78894d5d033938e (diff)
downloadQt-921f54e051b6fcc0268097347e2ad13ba0bfc37d.zip
Qt-921f54e051b6fcc0268097347e2ad13ba0bfc37d.tar.gz
Qt-921f54e051b6fcc0268097347e2ad13ba0bfc37d.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 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.qdoc2
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]