diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
| commit | 53b018a42813e44787aa1edc35d59feaa86cf9d7 (patch) | |
| tree | 7cce8f18faf26a87cfb5f27d1417c2a2ec86470c /src/corelib/io/qresource.cpp | |
| parent | 55c32b91a298d52bd7c29968d21b4b7a5ee741e4 (diff) | |
| parent | afa22a20c1b89960b647b0e3a9dc390fe6f87eae (diff) | |
| download | Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.zip Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.gz Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/io/qresource.cpp')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 2 |
1 files changed, 1 insertions, 1 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 |