diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-14 13:01:13 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-14 13:01:13 (GMT) |
| commit | 086a010a63895c6e6d178c1de9434483f11b2d34 (patch) | |
| tree | bb2542f04438b42ae5c61b1c3a6330f011700474 /src/corelib | |
| parent | 0fe36ac832abf8f8d438b21fce0177b65b3bbf3a (diff) | |
| parent | 5cb2226ddf96555417f08c9bfe35addfc93f6acd (diff) | |
| download | Qt-086a010a63895c6e6d178c1de9434483f11b2d34.zip Qt-086a010a63895c6e6d178c1de9434483f11b2d34.tar.gz Qt-086a010a63895c6e6d178c1de9434483f11b2d34.tar.bz2 | |
Merge branch 'qdoc-simplified' into mimir-simplified
Conflicts:
tools/qdoc3/atom.h
tools/qdoc3/qdoc3.pro
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qalgorithms.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index ce9c57e..b45710c 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -187,7 +187,7 @@ Q_GLOBAL_STATIC(QStringList, resourceSearchPaths) A QResource can either be loaded with an absolute path, either treated as a file system rooted with a \c{/} character, or in resource notation rooted with a \c{:} character. A relative resource can also be opened - which will be found through the searchPaths(). + which will be found in the list of paths returned by QDir::searchPaths(). A QResource that is representing a file will have data backing it, this data can possibly be compressed, in which case qUncompress() must be 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) |