summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-20 14:18:25 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-20 14:18:25 (GMT)
commit9bdc0a2d18bcc4938d79079e184a05acd5f43b22 (patch)
treeb4cff4d92d9239cc30c2c9bbf040b2493af66b26 /src/corelib/io
parent147c524e703d4727d03c5f2ea3f98ace25905b73 (diff)
parent76ef766a32cdcfd9cd64cf1d288c92a2b2040c15 (diff)
downloadQt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.zip
Qt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.tar.gz
Qt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.tar.bz2
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'src/corelib/io')
-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()
*/