summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-03-21 17:49:05 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-03-21 17:49:05 (GMT)
commit56b4ada44ea5bfa1c4ee669aa00e9ae960965fe3 (patch)
tree6fca2de5691d3e5dedc6b0ccd7e854c35b74fbd3 /src/corelib
parentde4954fd676c3bbf15abb9bedad4d09adc1c31b4 (diff)
parentf68f1de5b866a050c4b39f8eed984831b0e6956e (diff)
downloadQt-56b4ada44ea5bfa1c4ee669aa00e9ae960965fe3.zip
Qt-56b4ada44ea5bfa1c4ee669aa00e9ae960965fe3.tar.gz
Qt-56b4ada44ea5bfa1c4ee669aa00e9ae960965fe3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qresource.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index d35d68e..207cda3 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -373,7 +373,7 @@ QResourcePrivate::ensureChildren() const
Constructs a QResource pointing to \a file. \a locale is used to
load a specific localization of a resource data.
- \sa QFileInfo, searchPaths(), setFileName(), setLocale()
+ \sa QFileInfo, QDir::searchPaths(), setFileName(), setLocale()
*/
QResource::QResource(const QString &file, const QLocale &locale) : d_ptr(new QResourcePrivate(this))
@@ -418,7 +418,7 @@ QLocale QResource::locale() const
/*!
Sets a QResource to point to \a file. \a file can either be absolute,
in which case it is opened directly, if relative then the file will be
- tried to be found in searchPaths().
+ tried to be found in QDir::searchPaths().
\sa absoluteFilePath()
*/
@@ -446,7 +446,7 @@ QString QResource::fileName() const
/*!
Returns the real path that this QResource represents, if the resource
- was found via the searchPaths() it will be indicated in the path.
+ was found via the QDir::searchPaths() it will be indicated in the path.
\sa fileName()
*/