diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 16:49:58 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 16:49:58 (GMT) |
| commit | 7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d (patch) | |
| tree | 27bbf204f0fac8d99b4b4056337fc66c2733b24d /src/corelib/io/qresource.cpp | |
| parent | 27e403d9c6185c606980bb7881e39a2c88138a13 (diff) | |
| parent | 5d1d426afe07458a91b4908881554653285ed04c (diff) | |
| download | Qt-7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d.zip Qt-7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d.tar.gz Qt-7f018afe5ab8c2077880a239b0ab5ecbdb1d5b7d.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
Diffstat (limited to 'src/corelib/io/qresource.cpp')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index adfbb15..6d33c8b 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -555,16 +555,15 @@ QStringList QResource::children() const /*! \obsolete + Use QDir::addSearchPath() with a prefix instead. + Adds \a path to the search paths searched in to find resources that are not specified with an absolute path. The \a path must be an absolute path (start with \c{/}). The default search path is to search only in the root (\c{:/}). The last path added will be consulted first upon next QResource creation. - - Use QDir::addSearchPath() with a prefix instead. */ - void QResource::addSearchPath(const QString &path) { @@ -578,6 +577,10 @@ QResource::addSearchPath(const QString &path) } /*! + \obsolete + + Use QDir::searchPaths() instead. + Returns the current search path list. This list is consulted when creating a relative resource. |