diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-27 09:13:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-27 09:13:28 (GMT) |
| commit | e81da1a31a60d8307cd6e48ff6f011c91a7f6d10 (patch) | |
| tree | 96717c11d2276ecaab2035916c9f33435ded1daf /src/corelib | |
| parent | 084c5c697040e46180b6bcc0150683d9b363450c (diff) | |
| parent | 83ad5ebb033799352723a9d968b31a9cef61396c (diff) | |
| download | Qt-e81da1a31a60d8307cd6e48ff6f011c91a7f6d10.zip Qt-e81da1a31a60d8307cd6e48ff6f011c91a7f6d10.tar.gz Qt-e81da1a31a60d8307cd6e48ff6f011c91a7f6d10.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
make QFileSystemModel::rmdir(dir) remove dir from fileInfoGatherer
make QFileSystemWatcher_win distinguish C: from C:\
make QFileSystemModel distinguish C: from C:\
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index 249ce0f..71df3c2 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -86,7 +86,8 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, while (it.hasNext()) { QString path = it.next(); QString normalPath = path; - if ((normalPath.endsWith(QLatin1Char('/')) || normalPath.endsWith(QLatin1Char('\\'))) + if ((normalPath.endsWith(QLatin1Char('/')) && !normalPath.endsWith(QLatin1String(":/"))) + || (normalPath.endsWith(QLatin1Char('\\')) && !normalPath.endsWith(QLatin1String(":\\"))) #ifdef Q_OS_WINCE && normalPath.size() > 1) #else |