Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

Conflicts:
	src/corelib/io/qfilesystemwatcher_symbian.cpp
	src/corelib/io/qfilesystemwatcher_symbian_p.h

1 files changed, 2 insertions, 4 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
index 45bb752a1..a80344ecf 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian.cpp
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -44,6 +44,7 @@
 #include "qfileinfo.h"
 #include "qdebug.h"
 #include "private/qcore_symbian_p.h"
+#include "private/qcoreapplication_p.h"
 #include <QDir>
 
 #ifndef QT_NO_FILESYSTEMWATCHER
@@ -251,8 +252,6 @@ void QSymbianFileSystemWatcherEngine::run()
 {
     // Initialize file session
 
-    errorCode = fsSession.Connect();
-
     mutex.lock();
     syncCondition.wakeOne();
     mutex.unlock();
@@ -266,7 +265,6 @@ void QSymbianFileSystemWatcherEngine::run()
         }
 
         activeObjectToPath.clear();
-        fsSession.Close();
         watcherStarted = false;
     }
 }
@@ -276,7 +274,7 @@ void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directory
     QMutexLocker locker(&mutex);
     QString nativeDir(QDir::toNativeSeparators(directoryPath));
     TPtrC ptr(qt_QString2TPtrC(nativeDir));
-    currentEvent = new QNotifyChangeEvent(fsSession, ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
+    currentEvent = new QNotifyChangeEvent(QCoreApplicationPrivate::fsSession(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
     syncCondition.wakeOne();
 }