diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-06 06:52:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-06 06:52:51 (GMT) |
| commit | 3a632cb5f1c1da5c2e72ce167e35a42778867829 (patch) | |
| tree | 76540ae0ef94b3069afb2f043bd0d26d0b26cc5b /src/corelib/io/qdir.cpp | |
| parent | ab9c4f04fe86cbeed28800cbe0473738d9959871 (diff) | |
| parent | cb85dd1db4e42b35fd3727874d718389238b801f (diff) | |
| download | Qt-3a632cb5f1c1da5c2e72ce167e35a42778867829.zip Qt-3a632cb5f1c1da5c2e72ce167e35a42778867829.tar.gz Qt-3a632cb5f1c1da5c2e72ce167e35a42778867829.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/corelib/io/qdir.cpp')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 2 |
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); |