summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-23 09:28:39 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-23 09:28:39 (GMT)
commit0a1a01ea6e6496d79a59cd9b5f845d56fa1e53d6 (patch)
tree40d3cb986e8e1b9ce944af9fbe1210139a406601
parent6e9015a71645fa5da09cbd6240b45e1472a2c1ea (diff)
downloadQt-0a1a01ea6e6496d79a59cd9b5f845d56fa1e53d6.zip
Qt-0a1a01ea6e6496d79a59cd9b5f845d56fa1e53d6.tar.gz
Qt-0a1a01ea6e6496d79a59cd9b5f845d56fa1e53d6.tar.bz2
doc: Added \obsolete.
Task: QTBUG-8083
-rw-r--r--src/corelib/io/qdir.cpp8
-rw-r--r--src/corelib/io/qresource.cpp9
2 files changed, 10 insertions, 7 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index dc7f17e..69b3af4 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -993,15 +993,15 @@ void QDir::setNameFilters(const QStringList &nameFilters)
/*!
\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 default search
path is to search only in the root (\c{:/}).
- Use QDir::addSearchPath() with a prefix instead.
-
- \sa {The Qt Resource System}, QResource::addSearchPath()
+ \sa {The Qt Resource System}
*/
-
void QDir::addResourceSearchPath(const QString &path)
{
#ifdef QT_BUILD_CORE_LIB
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.