summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorMarius Bugge Monsen <mmonsen@trolltech.com>2009-10-21 12:46:15 (GMT)
committerMarius Bugge Monsen <mmonsen@trolltech.com>2009-10-21 12:46:15 (GMT)
commit757daee4365c8b4ed5fcf68bd5a38fc64593c549 (patch)
treef8619021bfd98dc0851de6cf861a8fb61c86b91f /src/corelib
parent140d5af0f8635397c48f160bb8a33861b332c171 (diff)
parent522fc01a18b9eae80b733befb98a948f0fbbba06 (diff)
downloadQt-757daee4365c8b4ed5fcf68bd5a38fc64593c549.zip
Qt-757daee4365c8b4ed5fcf68bd5a38fc64593c549.tar.gz
Qt-757daee4365c8b4ed5fcf68bd5a38fc64593c549.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qdir.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index a67b3bd..59db9a6 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -1930,7 +1930,7 @@ QString QDir::currentPath()
Under non-Windows operating systems the \c HOME environment
variable is used if it exists, otherwise the path returned by the
- rootPath().
+ rootPath(). On Symbian always the same as the path returned by the rootPath().
\sa home(), currentPath(), rootPath(), tempPath()
*/
@@ -2002,7 +2002,8 @@ QString QDir::tempPath()
Returns the absolute path of the root directory.
For Unix operating systems this returns "/". For Windows file
- systems this normally returns "c:/".
+ systems this normally returns "c:/". On Symbian this typically returns
+ "c:/data", i.e. the same as native PathInfo::PhoneMemoryRootPath().
\sa root(), drives(), currentPath(), homePath(), tempPath()
*/