diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-24 12:56:34 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-24 12:56:34 +0300 |
commit | a28db67043f46fb9fc6536af9786fd77d2e346b3 (patch) | |
tree | ce3a70a8deef96c3bd3496afda0834c09339b432 /src/corelib/io/qfilesystemwatcher_symbian.cpp | |
parent | 6d2a500a32fd3e0536420708c845bbb2799c92d1 (diff) | |
parent | 898cba2245b6fafa3820b44203442fedd9f7ed73 (diff) |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher_symbian.cpp')
-rw-r--r-- | src/corelib/io/qfilesystemwatcher_symbian.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp index a80344ecf..1d60752df 100644 --- a/src/corelib/io/qfilesystemwatcher_symbian.cpp +++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp @@ -44,7 +44,6 @@ #include "qfileinfo.h" #include "qdebug.h" #include "private/qcore_symbian_p.h" -#include "private/qcoreapplication_p.h" #include <QDir> #ifndef QT_NO_FILESYSTEMWATCHER @@ -274,7 +273,7 @@ void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directory QMutexLocker locker(&mutex); QString nativeDir(QDir::toNativeSeparators(directoryPath)); TPtrC ptr(qt_QString2TPtrC(nativeDir)); - currentEvent = new QNotifyChangeEvent(QCoreApplicationPrivate::fsSession(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive)); + currentEvent = new QNotifyChangeEvent(qt_s60GetRFs(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive)); syncCondition.wakeOne(); } |