diff options
| author | Iain <qt-info@nokia.com> | 2010-04-13 08:46:39 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2010-04-13 08:46:39 (GMT) |
| commit | ef84739c3737d03da9de2b5e92a68f70294c65d3 (patch) | |
| tree | 442cc0906ff5e5ee079d0777d7d6d1a1b66fce0a /doc/src | |
| parent | a036df97b0f66a8bf57171c5725becf2d2b6467b (diff) | |
| parent | 921f54e051b6fcc0268097347e2ad13ba0bfc37d (diff) | |
| download | Qt-ef84739c3737d03da9de2b5e92a68f70294c65d3.zip Qt-ef84739c3737d03da9de2b5e92a68f70294c65d3.tar.gz Qt-ef84739c3737d03da9de2b5e92a68f70294c65d3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/platforms/emb-features.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/doc/src/platforms/emb-features.qdoc b/doc/src/platforms/emb-features.qdoc index 1974a45..ab549d3 100644 --- a/doc/src/platforms/emb-features.qdoc +++ b/doc/src/platforms/emb-features.qdoc @@ -105,9 +105,6 @@ \note The \c qconfig tool is intended to be built against Qt on desktop platforms. - \bold{Windows CE:} The Qt for Windows CE package contains a \c qconfig - executable that you can run on a Windows desktop to configure the build. - \image qt-embedded-qconfigtool.png The \c qconfig tool's interface displays all of Qt's 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] |