diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-15 00:47:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-15 00:47:53 (GMT) |
| commit | 40aafa7e692bcb8f62ab564cfb5571685671f70b (patch) | |
| tree | 52601fc0df9d0c6823050f31569c8f8173a23615 /src | |
| parent | 192ed507cdb16125d2cdcaff63b1591c0d6b4596 (diff) | |
| parent | 08d1b0ab26dea5749461a988e6168f9dea6081f3 (diff) | |
| download | Qt-40aafa7e692bcb8f62ab564cfb5571685671f70b.zip Qt-40aafa7e692bcb8f62ab564cfb5571685671f70b.tar.gz Qt-40aafa7e692bcb8f62ab564cfb5571685671f70b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
Also test http proxy in the QTcpServer benchmark
Symbian QFileSystemWatcher: fix potential crash
Enable QTcpServer benchmark on symbian
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_symbian.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp index 6e5e911..63cc4f1 100644 --- a/src/corelib/io/qfilesystemwatcher_symbian.cpp +++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp @@ -62,9 +62,9 @@ QNotifyChangeEvent::QNotifyChangeEvent(RFs &fs, const TDesC &file, failureCount(0) { if (isDir) { - fsSession.NotifyChange(ENotifyEntry, iStatus, file); + fsSession.NotifyChange(ENotifyEntry, iStatus, watchedPath); } else { - fsSession.NotifyChange(ENotifyAll, iStatus, file); + fsSession.NotifyChange(ENotifyAll, iStatus, watchedPath); } CActiveScheduler::Add(this); SetActive(); |