diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 08:52:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 08:52:33 (GMT) |
| commit | a6044059d3bb6a1f3f319c3f07e75b2e4258a56f (patch) | |
| tree | c7ec0fe1e99be79f5f22339f7b2ea15aa6c0005d | |
| parent | 75121229e20361eefb2655932033bdbb557df433 (diff) | |
| parent | 5822db01277a19d8424b1f0d55868a82c8e719e6 (diff) | |
| download | Qt-a6044059d3bb6a1f3f319c3f07e75b2e4258a56f.zip Qt-a6044059d3bb6a1f3f319c3f07e75b2e4258a56f.tar.gz Qt-a6044059d3bb6a1f3f319c3f07e75b2e4258a56f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix two minor doc errors
| -rw-r--r-- | doc/src/platforms/emb-envvars.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qalgorithms.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/platforms/emb-envvars.qdoc b/doc/src/platforms/emb-envvars.qdoc index 1d109b4..3f318eb 100644 --- a/doc/src/platforms/emb-envvars.qdoc +++ b/doc/src/platforms/emb-envvars.qdoc @@ -112,7 +112,7 @@ device, e.g., \c /dev/mouse for mouse devices and \c /dev/ts for touch panels. - Multiple keyboard drivers can be specified in one go: + Multiple mouse drivers can be specified in one go: \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 3 diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc index 898f940..cd33f28 100644 --- a/src/corelib/tools/qalgorithms.qdoc +++ b/src/corelib/tools/qalgorithms.qdoc @@ -266,7 +266,7 @@ \overload - This is the same as qFind(\a{container}.begin(), \a{container}.end(), value); + This is the same as qFind(\a{container}.constBegin(), \a{container}.constEnd(), value); */ /*! \fn void qCount(InputIterator begin, InputIterator end, const T &value, Size &n) |