diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 08:14:28 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 08:14:28 (GMT) |
| commit | 9c5f08452da280a90de48d0fa3862748cc428df4 (patch) | |
| tree | 38e6d4192e6fcf4e807727e05d4508ecb9ecedde /src/corelib/io | |
| parent | 76d680844382ea24d40caaf9e0349e7b5af69ada (diff) | |
| parent | 1e48d40597bbe12321a5a3e42b3595dc17a7f8e7 (diff) | |
| download | Qt-9c5f08452da280a90de48d0fa3862748cc428df4.zip Qt-9c5f08452da280a90de48d0fa3862748cc428df4.tar.gz Qt-9c5f08452da280a90de48d0fa3862748cc428df4.tar.bz2 | |
Merge remote branch 'mainline/4.8'
Conflicts:
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index c0c62e1..d9086c1 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -2008,7 +2008,7 @@ QString QDir::cleanPath(const QString &path) const QChar *p = name.unicode(); for (int i = 0, last = -1, iwrite = 0; i < len; ++i) { if (p[i] == QLatin1Char('/')) { - while (i < len-1 && p[i+1] == QLatin1Char('/')) { + while (i+1 < len && p[i+1] == QLatin1Char('/')) { #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) //allow unc paths if (!i) break; @@ -2016,9 +2016,9 @@ QString QDir::cleanPath(const QString &path) i++; } bool eaten = false; - if (i < len - 1 && p[i+1] == QLatin1Char('.')) { + if (i+1 < len && p[i+1] == QLatin1Char('.')) { int dotcount = 1; - if (i < len - 2 && p[i+2] == QLatin1Char('.')) + if (i+2 < len && p[i+2] == QLatin1Char('.')) dotcount++; if (i == len - dotcount - 1) { if (dotcount == 1) { |