summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2019-11-05 10:34:28 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2019-11-06 08:41:46 +0100
commit4ada4f283efe4b2adcde29c2139dfc502c120399 (patch)
treed41ad80f0a5e3b75c670653cf80692013725d38e /src/corelib/io
parent88047be4ecb99799f4876ff3e7001abe34ac29bc (diff)
Make QDir::cleanPath documentation less misleading
The code doesn't convert anything that might be a separator on other platforms (most notably, '\') to '/', it only replaces platform-native separators (i.e. '\' if running on Windows) with '/'. Change-Id: I2e241b88b8bd271dfa5d7db61402fe8ef9a6bb6f Fixes: QTBUG-79736 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
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 fae935fc24..526702d151 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -2372,8 +2372,9 @@ static QString qt_cleanPath(const QString &path, bool *ok)
}
/*!
- Returns \a path with directory separators normalized (converted to "/") and
- redundant ones removed, and "."s and ".."s resolved (as far as possible).
+ Returns \a path with directory separators normalized (that is, platform-native
+ separators converted to "/") and redundant ones removed, and "."s and ".."s
+ resolved (as far as possible).
Symbolic links are kept. This function does not return the
canonical path, but rather the simplest version of the input.