summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-03-31 15:16:41 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-03-31 15:16:41 (GMT)
commit152c6f2deeaa4caa384561c0d865d13b50d44a42 (patch)
treebea1f1bc1297a5a3c8ca24a26407738061eeee80
parent8c186194030df820ac67a5793f2dbf5df268a25a (diff)
downloadQt-152c6f2deeaa4caa384561c0d865d13b50d44a42.zip
Qt-152c6f2deeaa4caa384561c0d865d13b50d44a42.tar.gz
Qt-152c6f2deeaa4caa384561c0d865d13b50d44a42.tar.bz2
Fix regression on Symbian
commit c43400792b637c744ca840a4ecb339ffdb27c604 made "x:/" a root directory only on windows. It should be a root on symbian too. Reviewed-by: mread
-rw-r--r--src/corelib/io/qdir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 1b60936..e54d95e 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -2125,7 +2125,7 @@ QString QDir::cleanPath(const QString &path)
QString ret = (used == len ? name : QString(out, used));
// Strip away last slash except for root directories
if (ret.length() > 1 && ret.endsWith(QLatin1Char('/'))) {
-#ifdef Q_OS_WIN
+#if defined (Q_OS_WIN) || defined (Q_OS_SYMBIAN)
if (!(ret.length() == 3 && ret.at(1) == QLatin1Char(':')))
#endif
ret.chop(1);