Merge branch 'master' of git@scm:qt/qt-s60-public

This brings support for the S60 platform into Qt.

32 files changed, 1921 insertions, 123 deletions

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index bd41f5e..b49554e 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -64,7 +64,8 @@ win32 {
 } else:unix {
         SOURCES += io/qfsfileengine_unix.cpp
         SOURCES += io/qfsfileengine_iterator_unix.cpp
-        SOURCES += io/qprocess_unix.cpp
+        symbian:SOURCES += io/qprocess_symbian.cpp
+        else:SOURCES += io/qprocess_unix.cpp
         macx-*: {
             HEADERS += io/qfilesystemwatcher_fsevents_p.h
             SOURCES += io/qsettings_mac.cpp io/qfilesystemwatcher_fsevents.cpp
@@ -84,4 +85,9 @@ win32 {
             SOURCES += io/qfilesystemwatcher_kqueue.cpp
             HEADERS += io/qfilesystemwatcher_kqueue_p.h
         }
+
+        symbian {
+            SOURCES += io/qfilesystemwatcher_symbian.cpp
+            HEADERS += io/qfilesystemwatcher_symbian_p.h
+        }
 }
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp
index 28a543b..c50263b 100644
--- a/src/corelib/io/qabstractfileengine.cpp
+++ b/src/corelib/io/qabstractfileengine.cpp
@@ -356,8 +356,6 @@ QAbstractFileEngine::QAbstractFileEngine(QAbstractFileEnginePrivate &dd) : d_ptr
  */
 QAbstractFileEngine::~QAbstractFileEngine()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
@@ -885,7 +883,6 @@ QAbstractFileEngineIterator::QAbstractFileEngineIterator(QDir::Filters filters,
 */
 QAbstractFileEngineIterator::~QAbstractFileEngineIterator()
 {
-    delete d;
 }
 
 /*!
diff --git a/src/corelib/io/qabstractfileengine.h b/src/corelib/io/qabstractfileengine.h
index 1bd79da..7029e8a 100644
--- a/src/corelib/io/qabstractfileengine.h
+++ b/src/corelib/io/qabstractfileengine.h
@@ -194,7 +194,7 @@ protected:
     QAbstractFileEngine();
     QAbstractFileEngine(QAbstractFileEnginePrivate &);
 
-    QAbstractFileEnginePrivate *d_ptr;
+    QScopedPointer<QAbstractFileEnginePrivate> d_ptr;
 private:
     Q_DECLARE_PRIVATE(QAbstractFileEngine)
     Q_DISABLE_COPY(QAbstractFileEngine)
@@ -238,7 +238,7 @@ private:
     friend class QDirIterator;
     friend class QDirIteratorPrivate;
     void setPath(const QString &path);
-    QAbstractFileEngineIteratorPrivate *d;
+    QScopedPointer<QAbstractFileEngineIteratorPrivate> d;
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index e78a35b..bd7b91c 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -80,8 +80,11 @@ public:
     inline QDebug &operator=(const QDebug &other);
     inline ~QDebug() {
         if (!--stream->ref) {
-            if(stream->message_output)
-                qt_message_output(stream->type, stream->buffer.toLocal8Bit().data());
+            if(stream->message_output) {
+                QT_TRY {
+                    qt_message_output(stream->type, stream->buffer.toLocal8Bit().data());
+                } QT_CATCH(std::bad_alloc) { /* We're out of memory - give up. */ }
+            }
             delete stream;
         }
     }
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index fd1e367..f9a1aca 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 static QString driveSpec(const QString &path)
 {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     if (path.size() < 2)
         return QString();
     char c = path.at(0).toAscii();
@@ -86,6 +86,7 @@ class QDirPrivate
     QDir *q_ptr;
     Q_DECLARE_PUBLIC(QDir)
 
+    friend struct QScopedPointerDeleter<QDirPrivate>;
 protected:
     QDirPrivate(QDir*, const QDir *copy=0);
     ~QDirPrivate();
@@ -150,7 +151,7 @@ private:
         QString path = p;
         if ((path.endsWith(QLatin1Char('/')) || path.endsWith(QLatin1Char('\\')))
                 && path.length() > 1) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
             if (!(path.length() == 3 && path.at(1) == QLatin1Char(':')))
 #endif
                 path.truncate(path.length() - 1);
@@ -287,10 +288,10 @@ inline void QDirPrivate::sortFileList(QDir::SortFlags sort, QFileInfoList &l,
                     names->append(l.at(i).fileName());
             }
         } else {
-            QDirSortItem *si = new QDirSortItem[n];
+            QScopedArrayPointer<QDirSortItem> si(new QDirSortItem[n]);
             for (int i = 0; i < n; ++i)
                 si[i].item = l.at(i);
-            qSort(si, si+n, QDirSortItemComparator(sort));
+            qSort(si.data(), si.data()+n, QDirSortItemComparator(sort));
             // put them back in the list(s)
             if(infos) {
                 for (int i = 0; i < n; ++i)
@@ -300,7 +301,6 @@ inline void QDirPrivate::sortFileList(QDir::SortFlags sort, QFileInfoList &l,
                 for (int i = 0; i < n; ++i)
                     names->append(si[i].item.fileName());
             }
-            delete [] si;
         }
     }
 }
@@ -333,8 +333,9 @@ void QDirPrivate::detach(bool createFileEngine)
 {
     qAtomicDetach(data);
     if (createFileEngine) {
+        QAbstractFileEngine *newFileEngine = QAbstractFileEngine::create(data->path);
         delete data->fileEngine;
-        data->fileEngine = QAbstractFileEngine::create(data->path);
+        data->fileEngine = newFileEngine;
     }
 }
 
@@ -588,8 +589,6 @@ QDir::QDir(const QDir &dir)  : d_ptr(new QDirPrivate(this, &dir))
 
 QDir::~QDir()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
@@ -787,6 +786,8 @@ QString QDir::relativeFilePath(const QString &fileName) const
     if (fileDrive.toLower() != dirDrive.toLower()
         || (file.startsWith(QLatin1String("//"))
         && !dir.startsWith(QLatin1String("//"))))
+#elif defined(Q_OS_SYMBIAN)
+    if (fileDrive.toLower() != dirDrive.toLower())
 #else
     if (fileDrive != dirDrive)
 #endif
@@ -802,7 +803,7 @@ QString QDir::relativeFilePath(const QString &fileName) const
 
     int i = 0;
     while (i < dirElts.size() && i < fileElts.size() &&
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
            dirElts.at(i).toLower() == fileElts.at(i).toLower())
 #else
            dirElts.at(i) == fileElts.at(i))
@@ -849,7 +850,7 @@ QString QDir::convertSeparators(const QString &pathName)
 QString QDir::toNativeSeparators(const QString &pathName)
 {
     QString n(pathName);
-#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX)
+#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN)
     for (int i=0; i<(int)n.length(); i++) {
         if (n[i] == QLatin1Char('/'))
             n[i] = QLatin1Char('\\');
@@ -873,7 +874,7 @@ QString QDir::toNativeSeparators(const QString &pathName)
 QString QDir::fromNativeSeparators(const QString &pathName)
 {
     QString n(pathName);
-#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX)
+#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN)
     for (int i=0; i<(int)n.length(); i++) {
         if (n[i] == QLatin1Char('\\'))
             n[i] = QLatin1Char('/');
@@ -1826,10 +1827,10 @@ QFileInfoList QDir::drives()
 
 QChar QDir::separator()
 {
-#if defined(Q_OS_UNIX)
-    return QLatin1Char('/');
-#elif defined (Q_FS_FAT) || defined(Q_WS_WIN)
+#if defined (Q_FS_FAT) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
     return QLatin1Char('\\');
+#elif defined(Q_OS_UNIX)
+    return QLatin1Char('/');
 #elif defined (Q_OS_MAC)
     return QLatin1Char(':');
 #else
@@ -1929,7 +1930,8 @@ QString QDir::currentPath()
 
     Under non-Windows operating systems the \c HOME environment
     variable is used if it exists, otherwise the path returned by the
-    rootPath() function is used.
+    rootPath() function is used, except in Symbian, where c:\\data is
+    returned.
 
     \sa home(), currentPath(), rootPath(), tempPath()
 */
@@ -2151,7 +2153,7 @@ QString QDir::cleanPath(const QString &path)
                     levels++;
                 }
             } else if(last != -1 && iwrite - last == 1) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
                 eaten = (iwrite > 2);
 #else
                 eaten = true;
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index 79a5be635..faec0f5 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -45,6 +45,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qstringlist.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -57,7 +58,7 @@ class QDirPrivate;
 class Q_CORE_EXPORT QDir
 {
 protected:
-    QDirPrivate *d_ptr;
+    QScopedPointer<QDirPrivate> d_ptr;
 private:
     Q_DECLARE_PRIVATE(QDir)
 public:
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index d9df480..3b7b203 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -99,6 +99,18 @@
 
 QT_BEGIN_NAMESPACE
 
+class QDirIteratorPrivateIteratorStack : public QStack<QAbstractFileEngineIterator *>
+{
+public:
+    ~QDirIteratorPrivateIteratorStack();
+};
+
+QDirIteratorPrivateIteratorStack::~QDirIteratorPrivateIteratorStack()
+{
+    qDeleteAll(*this);
+}
+
+
 class QDirIteratorPrivate
 {
 public:
@@ -112,7 +124,7 @@ public:
     void checkAndPushDirectory(const QFileInfo &);
     bool matchesFilters(const QString &fileName, const QFileInfo &fi) const;
 
-    QAbstractFileEngine * const engine;
+    QScopedPointer<QAbstractFileEngine> engine;
 
     const QString path;
     const QStringList nameFilters;
@@ -123,7 +135,7 @@ public:
     QVector<QRegExp> nameRegExps;
 #endif
 
-    QStack<QAbstractFileEngineIterator *> fileEngineIterators;
+    QDirIteratorPrivateIteratorStack fileEngineIterators;
     QFileInfo currentFileInfo;
     QFileInfo nextFileInfo;
 
@@ -163,7 +175,6 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList
 */
 QDirIteratorPrivate::~QDirIteratorPrivate()
 {
-    delete engine;
 }
 
 /*!
@@ -431,8 +442,6 @@ QDirIterator::QDirIterator(const QString &path, const QStringList &nameFilters,
 */
 QDirIterator::~QDirIterator()
 {
-    qDeleteAll(d->fileEngineIterators);
-    delete d;
 }
 
 /*!
diff --git a/src/corelib/io/qdiriterator.h b/src/corelib/io/qdiriterator.h
index a3500cf..d495a0b 100644
--- a/src/corelib/io/qdiriterator.h
+++ b/src/corelib/io/qdiriterator.h
@@ -84,7 +84,7 @@ public:
 private:
     Q_DISABLE_COPY(QDirIterator)
 
-    QDirIteratorPrivate *d;
+    QScopedPointer<QDirIteratorPrivate> d;
     friend class QDir;
 };
 
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index ab45bf7..026c1fd 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -105,6 +105,7 @@ QFilePrivate::openExternalFile(int flags, int fd)
     return false;
 #else
     delete fileEngine;
+    fileEngine = 0;
     QFSFileEngine *fe = new QFSFileEngine;
     fe->setFileName(fileName);
     fileEngine = fe;
@@ -121,6 +122,7 @@ QFilePrivate::openExternalFile(int flags, FILE *fh)
     return false;
 #else
     delete fileEngine;
+    fileEngine = 0;
     QFSFileEngine *fe = new QFSFileEngine;
     fe->setFileName(fileName);
     fileEngine = fe;
@@ -404,9 +406,6 @@ QFile::QFile(QFilePrivate &dd, QObject *parent)
 QFile::~QFile()
 {
     close();
-#ifdef QT_NO_QOBJECT
-    delete d_ptr;
-#endif
 }
 
 /*!
@@ -737,9 +736,10 @@ QFile::rename(const QString &newName)
                         error = true;
                     }
                 }
-                if (error)
+                if (error) {
                     out.remove();
-                else {
+                } else {
+					fileEngine()->setFileName(newName);
                     setPermissions(permissions());
                     unsetError();
                     setFileName(newName);
@@ -785,6 +785,9 @@ QFile::rename(const QString &oldName, const QString &newName)
 
     \note To create a valid link on Windows, \a linkName must have a \c{.lnk} file extension.
 
+    \note On Symbian, no link is created and false is returned if fileName()
+    currently specifies a directory.
+
     \sa setFileName()
 */
 
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 7873c6a..dc42a6f 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -371,8 +371,6 @@ QFileInfo::QFileInfo(const QFileInfo &fileinfo) : d_ptr(new QFileInfoPrivate(&fi
 
 QFileInfo::~QFileInfo()
 {
-    delete d_ptr;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index 1a21fa7..598b9de 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -165,7 +166,7 @@ public:
 #endif
 
 protected:
-    QFileInfoPrivate *d_ptr;
+    QScopedPointer<QFileInfoPrivate> d_ptr;
 private:
     Q_DECLARE_PRIVATE(QFileInfo)
 };
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index f7cc489..068f56a 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -62,6 +62,8 @@
 #  include "qfilesystemwatcher_fsevents_p.h"
 #  endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 #  include "qfilesystemwatcher_kqueue_p.h"
+#elif defined(Q_OS_SYMBIAN)
+#  include "qfilesystemwatcher_symbian_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -252,6 +254,8 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine()
     else
 #  endif
         return QKqueueFileSystemWatcherEngine::create();
+#elif defined(Q_OS_SYMBIAN)
+    return new QSymbianFileSystemWatcherEngine;
 #else
     return 0;
 #endif
diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
new file mode 100644
index 0000000..b920952
--- /dev/null
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -0,0 +1,289 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qfilesystemwatcher.h"
+#include "qfilesystemwatcher_symbian_p.h"
+#include "qfileinfo.h"
+#include "qdebug.h"
+#include "private/qcore_symbian_p.h"
+#include "private/qcoreapplication_p.h"
+#include <QDir>
+
+#ifndef QT_NO_FILESYSTEMWATCHER
+
+
+QT_BEGIN_NAMESPACE
+
+CNotifyChangeEvent* CNotifyChangeEvent::New(RFs &fs, const TDesC& file,
+        QSymbianFileSystemWatcherEngine* e, bool aIsDir)
+{
+    CNotifyChangeEvent* self = new CNotifyChangeEvent(fs, file, e, aIsDir);
+    return self;
+}
+
+CNotifyChangeEvent::CNotifyChangeEvent(RFs &fs, const TDesC& file,
+    QSymbianFileSystemWatcherEngine* e, bool aIsDir, TInt aPriority) :
+        CActive(aPriority),
+        isDir(aIsDir),
+        fsSession(fs),
+        watchedPath(file),
+        engine(e)
+{
+    if(isDir) {
+        fsSession.NotifyChange(ENotifyEntry, iStatus, file);
+    } else {
+        fsSession.NotifyChange(ENotifyAll, iStatus, file);
+    }
+    CActiveScheduler::Add(this);
+    SetActive();
+}
+
+CNotifyChangeEvent::~CNotifyChangeEvent()
+{
+    Cancel();
+}
+
+void CNotifyChangeEvent::RunL()
+{
+    if (iStatus.Int() == KErrNone) {
+        if(isDir) {
+            fsSession.NotifyChange(ENotifyEntry, iStatus, watchedPath);
+        } else {
+            fsSession.NotifyChange(ENotifyAll, iStatus, watchedPath);
+        }
+        SetActive();
+        QT_TRYCATCH_LEAVING(engine->emitPathChanged(this));
+    } else {
+        qWarning("CNotifyChangeEvent::RunL() - Failed to order change notifications: %d", iStatus.Int());
+    }
+}
+
+void CNotifyChangeEvent::DoCancel()
+{
+    fsSession.NotifyChangeCancel(iStatus);
+}
+
+QSymbianFileSystemWatcherEngine::QSymbianFileSystemWatcherEngine() :
+    watcherStarted(false)
+{
+    moveToThread(this);
+}
+
+QSymbianFileSystemWatcherEngine::~QSymbianFileSystemWatcherEngine()
+{
+    stop();
+}
+
+QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
+        QStringList *files, QStringList *directories)
+{
+    QMutexLocker locker(&mutex);
+    QStringList p = paths;
+
+    if (!startWatcher()) {
+        qWarning("Could not start QSymbianFileSystemWatcherEngine thread");
+
+        return p;
+    }
+
+    QMutableListIterator<QString> it(p);
+    while (it.hasNext()) {
+        QString path = it.next();
+        QFileInfo fi(path);
+        if (!fi.exists())
+            continue;
+
+        bool isDir = fi.isDir();
+        if (isDir) {
+            if (directories->contains(path))
+                continue;
+        } else {
+            if (files->contains(path))
+                continue;
+        }
+
+        // Use absolute filepath as relative paths seem to have some issues.
+        QString filePath = fi.absoluteFilePath();
+        if(isDir && filePath.at(filePath.size()-1) != QChar(L'/')) {
+            filePath += QChar(L'/');
+        }
+
+        currentEvent = NULL;
+        QMetaObject::invokeMethod(this,
+                "addNativeListener",
+                Qt::QueuedConnection,
+                Q_ARG(QString, filePath));
+
+        syncCondition.wait(&mutex);
+
+        if (currentEvent) {
+            currentEvent->isDir = isDir;
+
+            activeObjectToPath.insert(currentEvent, path);
+            it.remove();
+
+            if (isDir)
+                 directories->append(path);
+             else
+                 files->append(path);
+        }
+    }
+
+    return p;
+}
+
+QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &paths,
+        QStringList *files, QStringList *directories)
+{
+    QMutexLocker locker(&mutex);
+
+    QStringList p = paths;
+    QMutableListIterator<QString> it(p);
+    while (it.hasNext()) {
+        QString path = it.next();
+
+        currentEvent = activeObjectToPath.key(path);
+        if (!currentEvent)
+            continue;
+        activeObjectToPath.remove(currentEvent);
+
+        QMetaObject::invokeMethod(this,
+                "removeNativeListener",
+                Qt::QueuedConnection);
+
+        syncCondition.wait(&mutex);
+
+        it.remove();
+
+        files->removeAll(path);
+        directories->removeAll(path);
+    }
+
+    if (activeObjectToPath.size() == 0)
+        stop();
+
+    return p;
+}
+
+void QSymbianFileSystemWatcherEngine::emitPathChanged(CNotifyChangeEvent *e)
+{
+    QMutexLocker locker(&mutex);
+
+    QString path = activeObjectToPath.value(e);
+    QFileInfo fi(path);
+
+    if (e->isDir) {
+        emit directoryChanged(path, !fi.exists());
+    } else {
+        emit fileChanged(path, !fi.exists());
+    }
+}
+
+void QSymbianFileSystemWatcherEngine::stop()
+{
+    QMetaObject::invokeMethod(this, "quit");
+    wait();
+}
+
+// This method must be called inside mutex
+bool QSymbianFileSystemWatcherEngine::startWatcher()
+{
+    bool retval = true;
+
+    if (!watcherStarted) {
+#if defined(Q_OS_SYMBIAN)
+        setStackSize(0x5000);
+#endif
+        start();
+        syncCondition.wait(&mutex);
+
+        if (errorCode != KErrNone) {
+            retval = false;
+        } else {
+            watcherStarted = true;
+        }
+    }
+    return retval;
+}
+
+
+void QSymbianFileSystemWatcherEngine::run()
+{
+    // Initialize file session
+
+    mutex.lock();
+    syncCondition.wakeOne();
+    mutex.unlock();
+
+    if (errorCode == KErrNone) {
+        exec();
+
+        foreach(CNotifyChangeEvent* e, activeObjectToPath.keys()) {
+            e->Cancel();
+            delete e;
+        }
+
+        activeObjectToPath.clear();
+        watcherStarted = false;
+    }
+}
+
+void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directoryPath)
+{
+    QMutexLocker locker(&mutex);
+    QString nativeDir(QDir::toNativeSeparators(directoryPath));
+    TPtrC ptr(qt_QString2TPtrC(nativeDir));
+    currentEvent = CNotifyChangeEvent::New(QCoreApplicationPrivate::fsSession(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
+    syncCondition.wakeOne();
+}
+
+void QSymbianFileSystemWatcherEngine::removeNativeListener()
+{
+    QMutexLocker locker(&mutex);
+    currentEvent->Cancel();
+    delete currentEvent;
+    currentEvent = NULL;
+    syncCondition.wakeOne();
+}
+
+
+QT_END_NAMESPACE
+#endif // QT_NO_FILESYSTEMWATCHER
diff --git a/src/corelib/io/qfilesystemwatcher_symbian_p.h b/src/corelib/io/qfilesystemwatcher_symbian_p.h
new file mode 100644
index 0000000..23aa086
--- /dev/null
+++ b/src/corelib/io/qfilesystemwatcher_symbian_p.h
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFILESYSTEMWATCHER_SYMBIAN_P_H
+#define QFILESYSTEMWATCHER_SYMBIAN_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qfilesystemwatcher_p.h"
+#include "qhash.h"
+#include "qmutex.h"
+#include "qwaitcondition.h"
+
+#ifndef QT_NO_FILESYSTEMWATCHER
+
+#include <e32base.h>
+#include <f32file.h>
+
+QT_BEGIN_NAMESPACE
+
+class QSymbianFileSystemWatcherEngine;
+
+class CNotifyChangeEvent : public CActive
+{
+public:
+    CNotifyChangeEvent(RFs &fsSession, const TDesC& file, QSymbianFileSystemWatcherEngine* engine,
+            bool aIsDir, TInt aPriority = EPriorityStandard);
+    ~CNotifyChangeEvent();
+    static CNotifyChangeEvent* New(RFs &fsSession, const TDesC& file,
+            QSymbianFileSystemWatcherEngine* engine, bool aIsDir);
+
+    bool isDir;
+
+private:
+    void RunL();
+    void DoCancel();
+
+    RFs &fsSession;
+    TPath watchedPath;
+    QSymbianFileSystemWatcherEngine *engine;
+};
+
+class QSymbianFileSystemWatcherEngine : public QFileSystemWatcherEngine
+{
+    Q_OBJECT
+
+public:
+    QSymbianFileSystemWatcherEngine();
+    ~QSymbianFileSystemWatcherEngine();
+
+    QStringList addPaths(const QStringList &paths, QStringList *files,
+            QStringList *directories);
+    QStringList removePaths(const QStringList &paths, QStringList *files,
+            QStringList *directories);
+
+    void stop();
+
+protected:
+    void run();
+
+public Q_SLOTS:
+    void addNativeListener(const QString &directoryPath);
+    void removeNativeListener();
+
+private:
+    friend class CNotifyChangeEvent;
+    void emitPathChanged(CNotifyChangeEvent *e);
+
+    bool startWatcher();
+
+    QHash<CNotifyChangeEvent*, QString> activeObjectToPath;
+    QMutex mutex;
+    QWaitCondition syncCondition;
+    int errorCode;
+    bool watcherStarted;
+    CNotifyChangeEvent *currentEvent;
+};
+
+#endif // QT_NO_FILESYSTEMWATCHER
+
+QT_END_NAMESPACE
+
+#endif // QFILESYSTEMWATCHER_WIN_P_H
diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h
index 9be8a4c..f6db91c 100644
--- a/src/corelib/io/qfsfileengine.h
+++ b/src/corelib/io/qfsfileengine.h
@@ -83,6 +83,9 @@ public:
     FileFlags fileFlags(FileFlags type) const;
     bool setPermissions(uint perms);
     QString fileName(FileName file) const;
+#ifdef Q_OS_SYMBIAN
+    QString fileNameSymbian(FileName file) const;
+#endif
     uint ownerId(FileOwner) const;
     QString owner(FileOwner) const;
     QDateTime fileTime(FileTime time) const;
diff --git a/src/corelib/io/qfsfileengine_iterator_unix.cpp b/src/corelib/io/qfsfileengine_iterator_unix.cpp
index c167546..61c17ba 100644
--- a/src/corelib/io/qfsfileengine_iterator_unix.cpp
+++ b/src/corelib/io/qfsfileengine_iterator_unix.cpp
@@ -53,7 +53,7 @@ class QFSFileEngineIteratorPlatformSpecificData
 public:
     inline QFSFileEngineIteratorPlatformSpecificData()
         : dir(0), dirEntry(0), done(false)
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
           , mt_file(0)
 #endif
     {}
@@ -62,7 +62,7 @@ public:
     dirent *dirEntry;
     bool done;
 
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
     // for readdir_r
     dirent *mt_file;
 #endif
@@ -75,7 +75,7 @@ void QFSFileEngineIterator::advance()
     if (!platform->dir)
         return;
 
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
     if (::readdir_r(platform->dir, platform->mt_file, &platform->dirEntry) != 0)
         platform->done = true;
 #else
@@ -86,7 +86,7 @@ void QFSFileEngineIterator::advance()
         ::closedir(platform->dir);
         platform->dir = 0;
         platform->done = true;
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
         delete [] platform->mt_file;
         platform->mt_file = 0;
 #endif
@@ -102,7 +102,7 @@ void QFSFileEngineIterator::deletePlatformSpecifics()
 {
     if (platform->dir) {
         ::closedir(platform->dir);
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
         delete [] platform->mt_file;
         platform->mt_file = 0;
 #endif
@@ -123,7 +123,7 @@ bool QFSFileEngineIterator::hasNext() const
             if ((int) maxPathName == -1)
                 maxPathName = FILENAME_MAX;
             maxPathName += sizeof(dirent) + 1;
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) && !defined(Q_OS_SYMBIAN)
             if (that->platform->mt_file)
                 delete [] that->platform->mt_file;
             that->platform->mt_file = (dirent *)new char[maxPathName];
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 2ca0ec9..7a815fe 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -52,12 +52,17 @@
 #include "qfile.h"
 #include "qdir.h"
 #include "qdatetime.h"
-#include "qdebug.h"
 #include "qvarlengtharray.h"
 
 #include <sys/mman.h>
 #include <stdlib.h>
 #include <limits.h>
+#if defined(Q_OS_SYMBIAN)
+# include <syslimits.h>
+# include <f32file.h>
+# include "private/qcore_symbian_p.h"
+# include "private/qcoreapplication_p.h"
+#endif
 #include <errno.h>
 #if !defined(QWS) && defined(Q_OS_MAC)
 # include <private/qcore_mac_p.h>
@@ -65,6 +70,22 @@
 
 QT_BEGIN_NAMESPACE
 
+
+#ifdef Q_OS_SYMBIAN
+/*!
+    \internal
+
+    Returns true if supplied path is a relative path
+*/
+static bool isRelativePathSymbian(const QString& fileName)
+{
+    return !(fileName.startsWith(QLatin1Char('/'))
+        || (fileName.length() >= 2
+        && ((fileName.at(0).isLetter() && fileName.at(1) == QLatin1Char(':'))
+        || (fileName.at(0) == QLatin1Char('/') && fileName.at(1) == QLatin1Char('/')))));
+}
+#endif
+
 /*!
     \internal
 
@@ -379,11 +400,34 @@ bool QFSFileEngine::remove()
     return ret;
 }
 
-bool QFSFileEngine::copy(const QString &)
+bool QFSFileEngine::copy(const QString &newName)
 {
+#if defined(Q_OS_SYMBIAN)
+    Q_D(QFSFileEngine);
+    RFs& rfs = QCoreApplicationPrivate::fsSession();
+    CFileMan* fm = NULL;
+    QString oldNative(QDir::toNativeSeparators(d->filePath));
+    TPtrC oldPtr(qt_QString2TPtrC(oldNative));
+    QFileInfo fi(newName);
+    QString absoluteNewName = fi.absolutePath() + QDir::separator() + fi.fileName();
+    QString newNative(QDir::toNativeSeparators(absoluteNewName));
+    TPtrC newPtr(qt_QString2TPtrC(newNative));
+    TRAPD (err,
+        fm = CFileMan::NewL(rfs);
+        RFile rfile;
+        err = rfile.Open(rfs, oldPtr, EFileShareReadersOrWriters);
+        if (err == KErrNone) {
+            err = fm->Copy(rfile, newPtr);
+            rfile.Close();
+        }
+    ) // End TRAP
+    delete fm;
+    return (err == KErrNone);
+#else
     // ### Add copy code for Unix here
     setError(QFile::UnspecifiedError, QLatin1String("Not implemented!"));
     return false;
+#endif
 }
 
 bool QFSFileEngine::rename(const QString &newName)
@@ -413,7 +457,11 @@ bool QFSFileEngine::mkdir(const QString &name, bool createParentDirectories) con
 {
     QString dirName = name;
     if (createParentDirectories) {
+#if defined(Q_OS_SYMBIAN)
+        dirName = QDir::toNativeSeparators(QDir::cleanPath(dirName));
+#else
         dirName = QDir::cleanPath(dirName);
+#endif
         for(int oldslash = -1, slash=0; slash != -1; oldslash = slash) {
             slash = dirName.indexOf(QDir::separator(), oldslash+1);
             if (slash == -1) {
@@ -445,7 +493,11 @@ bool QFSFileEngine::rmdir(const QString &name, bool recurseParentDirectories) co
 {
     QString dirName = name;
     if (recurseParentDirectories) {
+#if defined(Q_OS_SYMBIAN)
+        dirName = QDir::toNativeSeparators(QDir::cleanPath(dirName));
+#else
         dirName = QDir::cleanPath(dirName);
+#endif
         for(int oldslash = 0, slash=dirName.length(); slash > 0; oldslash = slash) {
             QByteArray chunk = QFile::encodeName(dirName.left(slash));
             QT_STATBUF st;
@@ -466,7 +518,11 @@ bool QFSFileEngine::rmdir(const QString &name, bool recurseParentDirectories) co
 
 bool QFSFileEngine::caseSensitive() const
 {
+#if defined(Q_OS_SYMBIAN)
+    return false;
+#else
     return true;
+#endif
 }
 
 bool QFSFileEngine::setCurrentPath(const QString &path)
@@ -480,6 +536,16 @@ QString QFSFileEngine::currentPath(const QString &)
 {
     QString result;
     QT_STATBUF st;
+#if defined(Q_OS_SYMBIAN)
+    char currentName[PATH_MAX+1];
+    if (::getcwd(currentName, PATH_MAX))
+        result = QDir::fromNativeSeparators(QFile::decodeName(QByteArray(currentName)));
+    if (result.isEmpty()) {
+# if defined(QT_DEBUG)
+        qWarning("QDir::currentPath: getcwd() failed");
+# endif
+    } else
+#endif
     if (QT_STAT(".", &st) == 0) {
 #if defined(__GLIBC__) && !defined(PATH_MAX)
         char *currentName = ::get_current_dir_name();
@@ -487,18 +553,26 @@ QString QFSFileEngine::currentPath(const QString &)
             result = QFile::decodeName(QByteArray(currentName));
             ::free(currentName);
         }
-#else
+#elif !defined(Q_OS_SYMBIAN)
         char currentName[PATH_MAX+1];
         if (::getcwd(currentName, PATH_MAX))
             result = QFile::decodeName(QByteArray(currentName));
-#endif
-#if defined(QT_DEBUG)
+# if defined(QT_DEBUG)
         if (result.isNull())
             qWarning("QDir::currentPath: getcwd() failed");
+# endif
 #endif
     } else {
-#if defined(QT_DEBUG)
+#if defined(Q_OS_SYMBIAN)
+        // If current dir returned by Open C doesn't exist,
+        // try to create it (can happen with application private dirs)
+        // Ignore mkdir failures; we want to be consistent with Open C
+        // current path regardless.
+        ::mkdir(QFile::encodeName(currentName), 0777);
+#else
+# if defined(QT_DEBUG)
         qWarning("QDir::currentPath: stat(\".\") failed");
+# endif
 #endif
     }
     return result;
@@ -507,28 +581,58 @@ QString QFSFileEngine::currentPath(const QString &)
 QString QFSFileEngine::homePath()
 {
     QString home = QFile::decodeName(qgetenv("HOME"));
+#if defined(Q_OS_SYMBIAN)
+    if (home.isEmpty())
+        home = QLatin1String("C:/Data");
+#else
     if (home.isNull())
         home = rootPath();
+#endif
     return home;
 }
 
 QString QFSFileEngine::rootPath()
 {
+#if defined(Q_OS_SYMBIAN)
+    return QLatin1String("C:/");
+#else
     return QLatin1String("/");
+#endif
 }
 
 QString QFSFileEngine::tempPath()
 {
+#ifdef Q_OS_SYMBIAN
+    QString temp = QDir::currentPath().left(2);
+    temp += QLatin1String("/system/temp/");
+#else
     QString temp = QFile::decodeName(qgetenv("TMPDIR"));
     if (temp.isEmpty())
         temp = QLatin1String("/tmp/");
+#endif
     return temp;
 }
 
 QFileInfoList QFSFileEngine::drives()
 {
     QFileInfoList ret;
+#if defined(Q_OS_SYMBIAN)
+    TDriveList driveList;
+    RFs &rfs = QCoreApplicationPrivate::fsSession();
+    TInt err = rfs.DriveList(driveList);
+    if (err == KErrNone) {
+        for (char i = 0; i < KMaxDrives; i++) {
+            if (driveList[i]) {
+                ret.append(QString("%1:/").arg(QChar('A' + i)));
+            }
+        }
+    }
+    else {
+        qWarning("QDir::drives: Getting drives failed");
+    }
+#else
     ret.append(QFileInfo(rootPath()));
+#endif
     return ret;
 }
 
@@ -562,6 +666,28 @@ bool QFSFileEnginePrivate::isSymlink() const
     return is_link;
 }
 
+#if defined(Q_OS_SYMBIAN)
+static bool _q_isSymbianHidden(const QString &path, bool isDir)
+{
+    bool retval = false;
+    RFs rfs = QCoreApplicationPrivate::fsSession();
+    QFileInfo fi(path);
+    QString absPath = fi.absoluteFilePath();
+    if (isDir && absPath.at(absPath.size()-1) != QChar('/')) {
+        absPath += QChar('/');
+    }
+    QString native(QDir::toNativeSeparators(absPath));
+    TPtrC ptr(qt_QString2TPtrC(native));
+    TUint attributes;
+    TInt err = rfs.Att(ptr, attributes);
+    if (err == KErrNone && (attributes & KEntryAttHidden)) {
+        retval = true;
+    }
+
+    return retval;
+}
+#endif
+
 #if !defined(QWS) && defined(Q_OS_MAC)
 static bool _q_isMacHidden(const QString &path)
 {
@@ -666,25 +792,152 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const
         ret |= LocalDiskFlag;
         if (exists)
             ret |= ExistsFlag;
-            if (d->filePath == QLatin1String("/")) {
-                ret |= RootFlag;
-            } else {
-                QString baseName = fileName(BaseName);
-                if ((baseName.size() > 1
-                     && baseName.at(0) == QLatin1Char('.') && baseName.at(1) != QLatin1Char('.'))
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_SYMBIAN)
+        if (d->filePath == QLatin1String("/")
+            || (d->filePath.at(0).isLetter() && d->filePath.mid(1,d->filePath.length()) == QLatin1String(":/")))
+            ret |= RootFlag;
+
+        // In Symbian, all symlinks have hidden attribute for some reason;
+        // lets make them visible for better compatibility with other platforms.
+        // If somebody actually wants a hidden link, then they are out of luck.
+        if (!(ret & RootFlag) && !d->isSymlink())
+            if(_q_isSymbianHidden(d->filePath, ret & DirectoryType))
+                    ret |= HiddenFlag;
+#else
+        if (d->filePath == QLatin1String("/")) {
+            ret |= RootFlag;
+        } else {
+            QString baseName = fileName(BaseName);
+            if ((baseName.size() > 1
+                 && baseName.at(0) == QLatin1Char('.') && baseName.at(1) != QLatin1Char('.'))
+#  if !defined(QWS) && defined(Q_OS_MAC)
                     || _q_isMacHidden(d->filePath)
+#  endif
+               ) {
+                ret |= HiddenFlag;
+            }
+        }
 #endif
+    }
+    return ret;
+}
+
+#ifdef Q_OS_SYMBIAN
+QString QFSFileEngine::fileNameSymbian(FileName file) const
+{
+    Q_D(const QFSFileEngine);
+    if(file == BaseName) {
+        int slash = d->filePath.lastIndexOf(QLatin1Char('/'));
+        if(slash == -1) {
+            int colon = d->filePath.lastIndexOf(QLatin1Char(':'));
+            if(colon != -1)
+                return d->filePath.mid(colon + 1);
+            return d->filePath;
+        }
+        return d->filePath.mid(slash + 1);
+    } else if(file == PathName) {
+        if(!d->filePath.size())
+            return d->filePath;
+
+        int slash = d->filePath.lastIndexOf(QLatin1Char('/'));
+        if(slash == -1) {
+            if(d->filePath.length() >= 2 && d->filePath.at(1) == QLatin1Char(':'))
+                return d->filePath.left(2);
+            return QString::fromLatin1(".");
+        } else {
+            if(!slash)
+                return QString::fromLatin1("/");
+            if(slash == 2 && d->filePath.length() >= 2 && d->filePath.at(1) == QLatin1Char(':'))
+                slash++;
+            return d->filePath.left(slash);
+        }
+    } else if(file == AbsoluteName || file == AbsolutePathName) {
+        QString ret;
+        if (!isRelativePath()) {
+            if (d->filePath.size() > 2 && d->filePath.at(1) == QLatin1Char(':')
+                && d->filePath.at(2) != QLatin1Char('/') || // It's a drive-relative path, so Z:a.txt -> Z:\currentpath\a.txt
+                d->filePath.startsWith(QLatin1Char('/'))    // It's a absolute path to the current drive, so \a.txt -> Z:\a.txt
                 ) {
-                    ret |= HiddenFlag;
+                ret = QString(QDir::currentPath().left(2) + QDir::fromNativeSeparators(d->filePath));
+            } else {
+                ret = d->filePath;
+            }
+        } else {
+            ret = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + d->filePath);
+        }
+
+        // The path should be absolute at this point.
+        // From the docs :
+        // Absolute paths begin with the directory separator "/"
+        // (optionally preceded by a drive specification under Windows).
+        if (ret.at(0) != QLatin1Char('/')) {
+            Q_ASSERT(ret.length() >= 2);
+            Q_ASSERT(ret.at(0).isLetter());
+            Q_ASSERT(ret.at(1) == QLatin1Char(':'));
+
+            // Force uppercase drive letters.
+            ret[0] = ret.at(0).toUpper();
+        }
+
+        if (file == AbsolutePathName) {
+            int slash = ret.lastIndexOf(QLatin1Char('/'));
+            if (slash < 0)
+                return ret;
+            else if (ret.at(0) != QLatin1Char('/') && slash == 2)
+                return ret.left(3);      // include the slash
+            else
+                return ret.left(slash > 0 ? slash : 1);
+        }
+        return ret;
+    } else if(file == CanonicalName || file == CanonicalPathName) {
+        if (!(fileFlags(ExistsFlag) & ExistsFlag))
+            return QString();
+
+        QString ret = QFSFileEnginePrivate::canonicalized(fileName(AbsoluteName));
+        if (!ret.isEmpty() && file == CanonicalPathName) {
+            int slash = ret.lastIndexOf(QLatin1Char('/'));
+            if (slash == -1)
+                ret = QDir::fromNativeSeparators(QDir::currentPath());
+            else if (slash == 0)
+                ret = QLatin1String("/");
+            ret = ret.left(slash);
+        }
+        return ret;
+    } else if(file == LinkName) {
+        if (d->isSymlink()) {
+            char s[PATH_MAX+1];
+            int len = readlink(d->nativeFilePath.constData(), s, PATH_MAX);
+            if (len > 0) {
+                s[len] = '\0';
+                QString ret = QFile::decodeName(QByteArray(s));
+
+                if (isRelativePathSymbian(ret)) {
+                    if (!isRelativePathSymbian(d->filePath)) {
+                        ret.prepend(d->filePath.left(d->filePath.lastIndexOf(QLatin1Char('/')))
+                                    + QLatin1Char('/'));
+                    } else {
+                        ret.prepend(QDir::currentPath() + QLatin1Char('/'));
+                    }
                 }
+                ret = QDir::cleanPath(ret);
+                if (ret.size() > 1 && ret.endsWith(QLatin1Char('/')))
+                    ret.chop(1);
+                return ret;
             }
+        }
+        return QString();
+    } else if(file == BundleName) {
+        return QString();
     }
-    return ret;
+    return d->filePath;
 }
+#endif
 
 QString QFSFileEngine::fileName(FileName file) const
 {
+#ifdef Q_OS_SYMBIAN
+    return fileNameSymbian(file);
+#endif
     Q_D(const QFSFileEngine);
     if (file == BundleName) {
 #if !defined(QWS) && defined(Q_OS_MAC)
@@ -756,11 +1009,7 @@ QString QFSFileEngine::fileName(FileName file) const
             int size = PATH_CHUNK_SIZE;
 
             while (1) {
-                s = (char *) ::realloc(s, size);
-                if (s == 0) {
-                    len = -1;
-                    break;
-                }
+                s = q_check_ptr((char *) ::realloc(s, size));
                 len = ::readlink(d->nativeFilePath.constData(), s, size);
                 if (len < 0) {
                     ::free(s);
@@ -828,10 +1077,14 @@ QString QFSFileEngine::fileName(FileName file) const
 bool QFSFileEngine::isRelativePath() const
 {
     Q_D(const QFSFileEngine);
+#ifdef Q_OS_SYMBIAN
+    return isRelativePathSymbian(d->filePath);
+#else
     int len = d->filePath.length();
     if (len == 0)
         return true;
     return d->filePath[0] != QLatin1Char('/');
+#endif
 }
 
 uint QFSFileEngine::ownerId(FileOwner own) const
@@ -867,6 +1120,9 @@ QString QFSFileEngine::owner(FileOwner own) const
         if (pw)
             return QFile::decodeName(QByteArray(pw->pw_name));
     } else if (own == OwnerGroup) {
+#ifdef Q_OS_SYMBIAN
+        return QString();
+#endif
         struct group *gr = 0;
 #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
         size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index 81d365a..1fabc94 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -1290,7 +1290,7 @@ static QString readSymLink(const QString &link)
 static QString readLink(const QString &link)
 {
 #if !defined(Q_OS_WINCE)
-#if !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_LIBRARY) && !defined(Q_CC_MWERKS)
     QString ret;
 
     bool neededCoInit = false;
@@ -1347,7 +1347,7 @@ static QString readLink(const QString &link)
 bool QFSFileEngine::link(const QString &newName)
 {
 #if !defined(Q_OS_WINCE)
-#if !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_LIBRARY) && !defined(Q_CC_MWERKS)
     bool ret = false;
 
     QString linkName = newName;
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 35b85c3..4f66edd 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -1036,6 +1036,15 @@ qint64 QIODevice::readLine(char *data, qint64 maxSize)
         if (readSoFar)
             debugBinaryString(data, int(readSoFar));
 #endif
+#if defined(Q_OS_SYMBIAN)
+        // Open C fgets strips '\r' but readSoFar gets returned as if it was still there
+        if ((d->openMode & Text) &&
+            readSoFar > 1 &&
+            data[readSoFar - 1] == '\0' &&
+            data[readSoFar - 2] == '\n') {
+            --readSoFar;
+        }
+#endif
         if (readSoFar && data[readSoFar - 1] == '\n') {
             if (d->openMode & Text) {
                 // QRingBuffer::readLine() isn't Text aware.
@@ -1074,6 +1083,12 @@ qint64 QIODevice::readLine(char *data, qint64 maxSize)
     data[readSoFar] = '\0';
 
     if (d->openMode & Text) {
+#if defined(Q_OS_SYMBIAN)
+        // Open C fgets strips '\r' but readSoFar gets returned as if it was still there
+        if (readSoFar > 1 && data[readSoFar - 1] == '\0' && data[readSoFar - 2] == '\n') {
+            --readSoFar;
+        }
+#endif
         if (readSoFar > 1 && data[readSoFar - 1] == '\n' && data[readSoFar - 2] == '\r') {
             data[readSoFar - 2] = '\n';
             data[readSoFar - 1] = '\0';
diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h
index fff56fd..5bc415b 100644
--- a/src/corelib/io/qiodevice.h
+++ b/src/corelib/io/qiodevice.h
@@ -46,6 +46,7 @@
 #include <QtCore/qobject.h>
 #else
 #include <QtCore/qobjectdefs.h>
+#include <QtCore/qscopedpointer.h>
 #endif
 #include <QtCore/qstring.h>
 
@@ -160,7 +161,7 @@ protected:
     void setErrorString(const QString &errorString);
 
 #ifdef QT_NO_QOBJECT
-    QIODevicePrivate *d_ptr;
+    QScopedPointer<QIODevicePrivate> d_ptr;
 #endif
 
 private:
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 733887a..057492d 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -450,7 +450,8 @@ void QProcessPrivate::Channel::clear()
     used as an input source for QXmlReader, or for generating data to
     be uploaded using QFtp.
 
-    \note On Windows CE, reading and writing to a process is not supported.
+    \note On Windows CE and Symbian, reading and writing to a process
+    is not supported.
 
     When the process exits, QProcess reenters the \l NotRunning state
     (the initial state), and emits finished().
@@ -500,6 +501,10 @@ void QProcessPrivate::Channel::clear()
     setWorkingDirectory(). By default, processes are run in the
     current working directory of the calling process.
 
+    \note On Symbian, setting environment or working directory
+    is not supported. The working directory will always be the private
+    directory of the running process.
+
     \section1 Synchronous Process API
 
     QProcess provides a set of functions which allow it to be used
@@ -733,6 +738,10 @@ QProcessPrivate::QProcessPrivate()
 #ifdef Q_OS_UNIX
     serial = 0;
 #endif
+#ifdef Q_OS_SYMBIAN
+    symbianProcess = NULL;
+    processLaunched = false;
+#endif
 }
 
 /*! \internal
@@ -805,6 +814,13 @@ void QProcessPrivate::cleanup()
 #ifdef Q_OS_UNIX
     serial = 0;
 #endif
+#ifdef Q_OS_SYMBIAN
+    if (symbianProcess) {
+        symbianProcess->Close();
+        delete symbianProcess;
+        symbianProcess = NULL;
+    }
+#endif
 }
 
 /*! \internal
@@ -1062,7 +1078,7 @@ void QProcessPrivate::closeWriteChannel()
         if (stdinChannel.notifier) {
             qDeleteInEventHandler(stdinChannel.notifier);
             stdinChannel.notifier = 0;
-        } 
+        }
     }
 #ifdef Q_OS_WIN
     // ### Find a better fix, feeding the process little by little
@@ -1361,6 +1377,10 @@ QString QProcess::workingDirectory() const
     process in this directory. The default behavior is to start the
     process in the working directory of the calling process.
 
+    \note The working directory setting is ignored on Symbian;
+    the private directory of the process is considered its working
+    directory.
+
     \sa workingDirectory(), start()
 */
 void QProcess::setWorkingDirectory(const QString &dir)
@@ -1506,7 +1526,7 @@ void QProcess::setEnvironment(const QStringList &environment)
     using setEnvironment() or setEnvironmentHash(). If no environment
     has been set, the environment of the calling process will be used.
 
-    \note The environment settings are ignored on Windows CE,
+    \note The environment settings are ignored on Windows CE and Symbian,
     as there is no concept of an environment.
 
     \sa processEnvironment(), setEnvironment(), systemEnvironment()
@@ -1975,6 +1995,9 @@ void QProcess::start(const QString &program, OpenMode mode)
     event loop does not handle the WM_CLOSE message, can only be terminated by
     calling kill().
 
+    \note Terminating running processes from other processes will typically
+    cause a panic in Symbian due to platform security.
+
     \sa kill()
 */
 void QProcess::terminate()
@@ -1989,6 +2012,9 @@ void QProcess::terminate()
     On Windows, kill() uses TerminateProcess, and on Unix and Mac OS X, the
     SIGKILL signal is sent to the process.
 
+    \note Killing running processes from other processes will typically
+    cause a panic in Symbian due to platform security.
+
     \sa terminate()
 */
 void QProcess::kill()
@@ -2135,9 +2161,9 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #ifdef Q_OS_MAC
 # include <crt_externs.h>
 # define environ (*_NSGetEnviron())
-#elif defined(Q_OS_WINCE)
-  static char *qt_wince_environ[] = { 0 };
-#define environ qt_wince_environ
+#elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+  static char *qt_empty_environ[] = { 0 };
+#define environ qt_empty_environ
 #elif !defined(Q_OS_WIN)
   extern char **environ;
 #endif
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index 0498d1e..e0c7efb 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -54,8 +54,13 @@ QT_MODULE(Core)
 
 #ifndef QT_NO_PROCESS
 
-#if (!defined(Q_OS_WIN32) && !defined(Q_OS_WINCE)) || defined(qdoc)
+#if (!defined(Q_OS_WIN32) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)) || defined(qdoc)
 typedef qint64 Q_PID;
+#elif defined(Q_OS_SYMBIAN)
+QT_END_NAMESPACE
+#  include <e32std.h>
+QT_BEGIN_NAMESPACE
+typedef TProcessId Q_PID;
 #else
 QT_END_NAMESPACE
 typedef struct _PROCESS_INFORMATION *Q_PID;
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
index b581e91..62a2ecc 100644
--- a/src/corelib/io/qprocess_p.h
+++ b/src/corelib/io/qprocess_p.h
@@ -197,7 +197,7 @@ public:
     QWinEventNotifier *processFinishedNotifier;
 
     void startProcess();
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     void execChild(const char *workingDirectory, char **path, char **argv, char **envp);
 #endif
     bool processStarted();
@@ -238,6 +238,11 @@ public:
 #ifdef Q_OS_UNIX
     static void initializeProcessManager();
 #endif
+
+#ifdef Q_OS_SYMBIAN
+    bool processLaunched;
+    RProcess* symbianProcess;
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
new file mode 100644
index 0000000..a8c72d3
--- /dev/null
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -0,0 +1,1035 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//#define QPROCESS_DEBUG
+
+#ifdef QPROCESS_DEBUG
+#include "qdebug.h"
+#define QPROCESS_DEBUG_PRINT(args...) qDebug(args);
+#else
+#define QPROCESS_DEBUG_PRINT(args...)
+#endif
+
+#ifndef QT_NO_PROCESS
+
+#define QPROCESS_ASSERT(check, panicReason, args...) \
+    if (!(check)) { \
+        qWarning(args); \
+        User::Panic(KQProcessPanic, panicReason); \
+    }
+
+#include <exception>
+#include <e32base.h>
+#include <e32std.h>
+#include <stdio.h>
+#include "qplatformdefs.h"
+
+#include "qstring.h"
+#include "qprocess.h"
+#include "qprocess_p.h"
+#include "qeventdispatcher_symbian_p.h"
+
+#include <private/qthread_p.h>
+#include <qmutex.h>
+#include <qmap.h>
+#include <qsocketnotifier.h>
+
+#include <errno.h>
+
+
+QT_BEGIN_NAMESPACE
+
+_LIT(KQProcessManagerThreadName, "QProcManThread");
+_LIT(KQProcessPanic, "QPROCESS");
+enum TQProcessPanic {
+    EProcessManagerMediatorRunError         = 1,
+    EProcessManagerMediatorInactive         = 2,
+    EProcessManagerMediatorNotPending       = 3,
+    EProcessManagerMediatorInvalidCmd       = 4,
+    EProcessManagerMediatorCreationFailed   = 5,
+    EProcessManagerMediatorThreadOpenFailed = 6,
+    EProcessManagerMediatorNullObserver     = 7,
+    EProcessActiveRunError                  = 10,
+    EProcessActiveNullParameter             = 11,
+    EProcessManagerMutexCreationFail        = 20,
+    EProcessManagerThreadCreationFail       = 21,
+    EProcessManagerSchedulerCreationFail    = 22,
+    EProcessManagerNullParam                = 23
+};
+
+// Forward declarations
+class QProcessManager;
+
+
+// Active object to listen for child process death
+class CProcessActive : public CActive
+{
+public:
+    static CProcessActive* construct(QProcess* process,
+                               RProcess** proc,
+                               int serial,
+                               int deathPipe);
+
+    virtual ~CProcessActive();
+
+    void start();
+    void stop();
+
+    bool error();
+
+protected:
+
+    // From CActive
+    void RunL();
+    TInt RunError(TInt aError);
+    void DoCancel();
+
+    CProcessActive();
+
+private:
+
+    QProcess* process;
+    RProcess** pproc;
+    int serial;
+    int deathPipe;
+    bool errorValue;
+};
+
+// Active object to communicate synchronously with process manager thread
+class CProcessManagerMediator : public CActive
+{
+public:
+    static CProcessManagerMediator* construct();
+
+    virtual ~CProcessManagerMediator();
+
+    bool add(CProcessActive* processObserver);
+    void remove(CProcessActive* processObserver);
+    void terminate();
+
+protected:
+
+    enum Commands {
+        ENoCommand,
+        EAdd,
+        ERemove,
+        ETerminate
+    };
+
+    // From CActive
+    void RunL();
+    TInt RunError(TInt aError);
+    void DoCancel();
+
+    CProcessManagerMediator();
+
+    bool notify(CProcessActive* processObserver, Commands command);
+
+private:
+    CProcessActive* currentObserver;
+    Commands currentCommand;
+
+    RThread processManagerThread;
+};
+
+// Process manager manages child process death listeners
+class QProcessManager
+{
+public:
+    QProcessManager();
+    ~QProcessManager();
+
+    void startThread();
+
+    TInt run(void* param);
+    bool add(QProcess *process);
+    void remove(QProcess *process);
+
+    inline void setMediator(CProcessManagerMediator* newMediator) {mediator = newMediator;};
+
+private:
+    inline void lock() {managerMutex.Wait();};
+    inline void unlock() {managerMutex.Signal();};
+
+    QMap<int, CProcessActive *> children;
+    CProcessManagerMediator* mediator;
+    RMutex managerMutex;
+    bool threadStarted;
+    RThread managerThread;
+};
+
+static bool qt_rprocess_running(RProcess* proc)
+{
+    if(proc && proc->Handle()) {
+        TExitType et = proc->ExitType();
+        if (et == EExitPending) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static void qt_create_symbian_commandline(const QStringList &arguments, QString& commandLine)
+{
+    for (int i=0; i<arguments.size(); ++i) {
+        QString tmp = arguments.at(i);
+        // in the case of \" already being in the string the \ must also be escaped
+        tmp.replace( QLatin1String("\\\""), QLatin1String("\\\\\"") );
+        // escape a single " because the arguments will be parsed
+        tmp.replace( QLatin1String("\""), QLatin1String("\\\"") );
+        if (tmp.isEmpty() || tmp.contains(QLatin1Char(' ')) || tmp.contains(QLatin1Char('\t'))) {
+            // The argument must not end with a \ since this would be interpreted
+            // as escaping the quote -- rather put the \ behind the quote: e.g.
+            // rather use "foo"\ than "foo\"
+            QString endQuote(QLatin1String("\""));
+            int i = tmp.length();
+            while (i>0 && tmp.at(i-1) == QLatin1Char('\\')) {
+                --i;
+                endQuote += QLatin1String("\\");
+            }
+            commandLine += QLatin1String(" \"") + tmp.left(i) + endQuote;
+        } else {
+            commandLine += QLatin1Char(' ') + tmp;
+        }
+    }
+}
+
+static TInt qt_create_symbian_process(RProcess **proc, const QString &programName, const QStringList &arguments)
+{
+    RProcess* newProc = NULL;
+    newProc = new RProcess();
+
+    if (!newProc) {
+        return KErrNoMemory;
+    }
+
+    QString commandLine;
+    qt_create_symbian_commandline(arguments, commandLine);
+
+    TPtrC program_ptr(reinterpret_cast<const TText*>(programName.constData()));
+    TPtrC cmdline_ptr(reinterpret_cast<const TText*>(commandLine.constData()));
+
+    TInt err = newProc->Create(program_ptr, cmdline_ptr);
+
+    if (err == KErrNotFound){
+        // Strip path from program name and try again (i.e. try from default location "\sys\bin")
+        int index = programName.lastIndexOf(QChar('\\'));
+        int index2 = programName.lastIndexOf(QChar('/'));
+        index = qMax(index, index2);
+
+        if(index != -1 && programName.length() >= index){
+            QString strippedName;
+            strippedName = programName.mid(index+1);
+            QPROCESS_DEBUG_PRINT("qt_create_symbian_process() Process '%s' not found, try stripped version '%s'", qPrintable(programName), qPrintable(strippedName));
+
+            TPtrC stripped_ptr(reinterpret_cast<const TText*>(strippedName.constData()));
+            err = newProc->Create(stripped_ptr, cmdline_ptr);
+
+            if (err != KErrNone) {
+                QPROCESS_DEBUG_PRINT("qt_create_symbian_process() Unable to create process '%s': %d", qPrintable(strippedName), err);
+            }
+        }
+    }
+
+    if (err == KErrNone) {
+        *proc = newProc;
+    } else {
+        delete newProc;
+    }
+
+    return err;
+}
+
+static qint64 qt_native_read(int fd, char *data, qint64 maxlen)
+{
+    qint64 ret = 0;
+    do {
+        ret = ::read(fd, data, maxlen);
+    } while (ret == -1 && errno == EINTR);
+
+    QPROCESS_DEBUG_PRINT("qt_native_read(): fd: %d, result: %d, errno = %d", fd, (int)ret, errno);
+
+    return ret;
+}
+
+static qint64 qt_native_write(int fd, const char *data, qint64 len)
+{
+    qint64 ret = 0;
+    do {
+        ret = ::write(fd, data, len);
+    } while (ret == -1 && errno == EINTR);
+
+    QPROCESS_DEBUG_PRINT("qt_native_write(): fd: %d, result: %d, errno = %d", fd, (int)ret, errno);
+
+    return ret;
+}
+
+static void qt_native_close(int fd)
+{
+    int ret;
+    do {
+        ret = ::close(fd);
+    } while (ret == -1 && errno == EINTR);
+}
+
+static void qt_create_pipe(int *pipe)
+{
+    if (pipe[0] != -1)
+        qt_native_close(pipe[0]);
+    if (pipe[1] != -1)
+        qt_native_close(pipe[1]);
+    if (::pipe(pipe) != 0) {
+        qWarning("QProcessPrivate::createPipe: Cannot create pipe %p: %s",
+                 pipe, qPrintable(qt_error_string(errno)));
+    } else {
+        QPROCESS_DEBUG_PRINT("qt_create_pipe(): Created pipe %d - %d", pipe[0], pipe[1]);
+    }
+}
+
+// Called from ProcessManagerThread
+CProcessActive* CProcessActive::construct(QProcess* process,
+                                          RProcess** proc,
+                                          int serial,
+                                          int deathPipe)
+{
+    QPROCESS_ASSERT((process || proc || *proc),
+        EProcessActiveNullParameter,
+        "CProcessActive::construct(): process (0x%x), proc (0x%x) or *proc == NULL, not creating an instance", process, proc)
+
+    CProcessActive*  newInstance = new CProcessActive();
+
+    if (!newInstance) {
+        QPROCESS_DEBUG_PRINT("CProcessActive::construct(): Failed to create new instance");
+    } else {
+        newInstance->process = process;
+        newInstance->pproc = proc;
+        newInstance->serial = serial;
+        newInstance->deathPipe = deathPipe;
+        newInstance->errorValue = false;
+    }
+
+    return newInstance;
+}
+
+// Called from ProcessManagerThread
+CProcessActive::CProcessActive()
+    : CActive(CActive::EPriorityStandard)
+{
+    // Nothing to do
+}
+
+// Called from ProcessManagerThread
+CProcessActive::~CProcessActive()
+{
+    process = NULL;
+    pproc = NULL;
+}
+
+// Called from ProcessManagerThread
+void CProcessActive::start()
+{
+    if (qt_rprocess_running(*pproc)) {
+        CActiveScheduler::Add(this);
+        (*pproc)->Logon(iStatus);
+        SetActive();
+        QPROCESS_DEBUG_PRINT("CProcessActive::start(): Started monitoring for process exit.");
+    } else {
+        QPROCESS_DEBUG_PRINT("CProcessActive::start(): Process doesn't exist or is already dead");
+        // Assume process has already died
+        qt_native_write(deathPipe, "", 1);
+        errorValue = true;
+    }
+}
+
+// Called from ProcessManagerThread
+void CProcessActive::stop()
+{
+    QPROCESS_DEBUG_PRINT("CProcessActive::stop()");
+
+    // Remove this from scheduler (also cancels the request)
+    Deque();
+}
+
+bool CProcessActive::error()
+{
+    return errorValue;
+}
+
+// Called from ProcessManagerThread
+void CProcessActive::RunL()
+{
+    // If this method gets executed, the monitored process has died
+
+    // Notify main thread
+    qt_native_write(deathPipe, "", 1);
+    QPROCESS_DEBUG_PRINT("CProcessActive::RunL() sending death notice to %d", deathPipe);
+}
+
+// Called from ProcessManagerThread
+TInt CProcessActive::RunError(TInt aError)
+{
+    Q_UNUSED(aError);
+    // Handle RunL leave (should never happen)
+    QPROCESS_ASSERT(0, EProcessActiveRunError, "CProcessActive::RunError(): Should never get here!")
+    return 0;
+}
+
+// Called from ProcessManagerThread
+void CProcessActive::DoCancel()
+{
+    QPROCESS_DEBUG_PRINT("CProcessActive::DoCancel()");
+
+    if (qt_rprocess_running(*pproc)) {
+        (*pproc)->LogonCancel(iStatus);
+        QPROCESS_DEBUG_PRINT("CProcessActive::DoCancel(): Stopped monitoring for process exit.");
+    } else {
+        QPROCESS_DEBUG_PRINT("CProcessActive::DoCancel(): Process doesn't exist");
+    }
+}
+
+
+// Called from ProcessManagerThread
+CProcessManagerMediator* CProcessManagerMediator::construct()
+{
+    CProcessManagerMediator*  newInstance = new CProcessManagerMediator;
+    TInt err(KErrNone);
+
+    newInstance->currentCommand = ENoCommand;
+    newInstance->currentObserver = NULL;
+
+    if (newInstance) {
+        err = newInstance->processManagerThread.Open(newInstance->processManagerThread.Id());
+        QPROCESS_ASSERT((err == KErrNone),
+            EProcessManagerMediatorThreadOpenFailed,
+            "CProcessManagerMediator::construct(): Failed to open processManagerThread (err:%d)", err)
+    } else {
+        QPROCESS_ASSERT(0,
+            EProcessManagerMediatorCreationFailed,
+            "CProcessManagerMediator::construct(): Failed to open construct mediator")
+    }
+
+    // Activate mediator
+    CActiveScheduler::Add(newInstance);
+    newInstance->iStatus = KRequestPending;
+    newInstance->SetActive();
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::construct(): new instance successfully created and activated");
+
+    return newInstance;
+}
+
+// Called from ProcessManagerThread
+CProcessManagerMediator::CProcessManagerMediator()
+    : CActive(CActive::EPriorityStandard)
+{
+    // Nothing to do
+}
+
+// Called from ProcessManagerThread
+CProcessManagerMediator::~CProcessManagerMediator()
+{
+    processManagerThread.Close();
+	currentCommand = ENoCommand;
+    currentObserver = NULL;
+}
+
+// Called from main thread
+bool CProcessManagerMediator::add(CProcessActive* processObserver)
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::add()");
+    return notify(processObserver, EAdd);
+}
+
+// Called from main thread
+void CProcessManagerMediator::remove(CProcessActive* processObserver)
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::remove()");
+    notify(processObserver, ERemove);
+}
+
+// Called from main thread
+void CProcessManagerMediator::terminate()
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::terminate()");
+    notify(NULL, ETerminate);
+}
+
+// Called from main thread
+bool CProcessManagerMediator::notify(CProcessActive* processObserver, Commands command)
+{
+    bool success(true);
+
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::Notify(): Command: %d, processObserver: 0x%x", command, processObserver);
+
+    QPROCESS_ASSERT((command == ETerminate || processObserver),
+        EProcessManagerMediatorNullObserver,
+        "CProcessManagerMediator::Notify(): NULL processObserver not allowed for command: %d", command)
+
+    QPROCESS_ASSERT(IsActive(),
+        EProcessManagerMediatorInactive,
+        "CProcessManagerMediator::Notify(): Mediator is not active!")
+
+    QPROCESS_ASSERT(iStatus==KRequestPending,
+        EProcessManagerMediatorNotPending,
+        "CProcessManagerMediator::Notify(): Mediator request not pending!")
+
+    currentObserver = processObserver;
+    currentCommand = command;
+
+    // Sync with process manager thread
+    TRequestStatus pmStatus;
+    processManagerThread.Rendezvous(pmStatus);
+
+    // Complete request -> RunL will run in the process manager thread
+    TRequestStatus* status = &iStatus;
+    processManagerThread.RequestComplete(status, command);
+
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::Notify(): Waiting process manager to complete...");
+    User::WaitForRequest(pmStatus);
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::Notify(): Wait over");
+
+    if (currentObserver) {
+        success = !(currentObserver->error());
+        QPROCESS_DEBUG_PRINT("CProcessManagerMediator::Notify(): success = %d", success);
+    }
+
+    currentObserver = NULL;
+    currentCommand = ENoCommand;
+
+    return success;
+}
+
+// Called from ProcessManagerThread
+void CProcessManagerMediator::RunL()
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::RunL(): currentCommand: %d, iStatus: %d", currentCommand, iStatus.Int());
+    switch (currentCommand) {
+        case EAdd:
+            currentObserver->start();
+            break;
+        case ERemove:
+            currentObserver->stop();
+            break;
+        case ETerminate:
+            Deque();
+            CActiveScheduler::Stop();
+            return;
+        default:
+            QPROCESS_ASSERT(0,
+                EProcessManagerMediatorInvalidCmd,
+                "CProcessManagerMediator::RunL(): Invalid command!")
+            break;
+    }
+
+    iStatus = KRequestPending;
+    SetActive();
+
+    // Notify main thread that we are done
+    RThread::Rendezvous(KErrNone);
+}
+
+// Called from ProcessManagerThread
+TInt CProcessManagerMediator::RunError(TInt aError)
+{
+    Q_UNUSED(aError);
+    // Handle RunL leave (should never happen)
+    QPROCESS_ASSERT(0,
+        EProcessManagerMediatorRunError,
+        "CProcessManagerMediator::RunError(): Should never get here!")
+    return 0;
+}
+
+// Called from ProcessManagerThread
+void CProcessManagerMediator::DoCancel()
+{
+    QPROCESS_DEBUG_PRINT("CProcessManagerMediator::DoCancel()");
+    TRequestStatus* status = &iStatus;
+    processManagerThread.RequestComplete(status, KErrCancel);
+}
+
+Q_GLOBAL_STATIC(QProcessManager, processManager)
+
+TInt processManagerThreadFunction(TAny* param)
+{
+    QPROCESS_ASSERT(param,
+        EProcessManagerNullParam,
+        "processManagerThreadFunction(): NULL param")
+
+    QProcessManager* manager = reinterpret_cast<QProcessManager*>(param);
+
+    CActiveScheduler* scheduler = new CQtActiveScheduler();
+
+    QPROCESS_ASSERT(scheduler,
+        EProcessManagerSchedulerCreationFail,
+        "processManagerThreadFunction(): Scheduler creation failed")
+
+    CActiveScheduler::Install(scheduler);
+
+    //Creating mediator also adds it to scheduler and activates it. Failure will panic.
+    manager->setMediator(CProcessManagerMediator::construct());
+    RThread::Rendezvous(KErrNone);
+
+    CActiveScheduler::Start();
+
+    CActiveScheduler::Install(NULL);
+    delete scheduler;
+
+    return KErrNone;
+}
+
+QProcessManager::QProcessManager()
+    : mediator(NULL), threadStarted(false)
+{
+    TInt err = managerMutex.CreateLocal();
+
+    QPROCESS_ASSERT(err == KErrNone,
+        EProcessManagerMutexCreationFail,
+        "QProcessManager::QProcessManager(): Failed to create new managerMutex (err: %d)", err)
+}
+
+QProcessManager::~QProcessManager()
+{
+    QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager()");
+    // Cancel death listening for all child processes
+    if (mediator) {
+        QMap<int, CProcessActive *>::Iterator it = children.begin();
+        while (it != children.end()) {
+            // Remove all monitors
+            CProcessActive *active = it.value();
+            mediator->remove(active);
+
+            QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager() removed listening for a process");
+            ++it;
+        }
+
+        // Terminate process manager thread.
+        mediator->terminate();
+        delete mediator;
+    }
+
+    qDeleteAll(children.values());
+    children.clear();
+	managerThread.Close();
+    managerMutex.Close();
+}
+
+void QProcessManager::startThread()
+{
+    lock();
+
+    if (!threadStarted) {
+        TInt err = managerThread.Create(KQProcessManagerThreadName,
+                                        processManagerThreadFunction,
+                                        0x5000,
+                                        (RAllocator*)NULL,
+                                        (TAny*)this,
+                                        EOwnerProcess);
+
+        QPROCESS_ASSERT(err == KErrNone,
+            EProcessManagerThreadCreationFail,
+            "QProcessManager::startThread(): Failed to create new managerThread (err:%d)", err)
+
+        threadStarted = true;
+
+        // Manager thread must start running before we continue, so sync with rendezvous
+        TRequestStatus status;
+        managerThread.Rendezvous(status);
+        managerThread.Resume();
+        User::WaitForRequest(status);
+    }
+
+    unlock();
+}
+
+static QBasicAtomicInt idCounter = Q_BASIC_ATOMIC_INITIALIZER(1);
+
+bool QProcessManager::add(QProcess *process)
+{
+    QPROCESS_ASSERT(process,
+        EProcessManagerNullParam,
+        "QProcessManager::add(): Failed to add CProcessActive to ProcessManager - NULL process")
+
+    lock();
+
+    int serial = idCounter.fetchAndAddRelaxed(1);
+    process->d_func()->serial = serial;
+
+    QPROCESS_DEBUG_PRINT("QProcessManager::add(): serial: %d, deathPipe: %d - %d, symbianProcess: 0x%x", serial, process->d_func()->deathPipe[0], process->d_func()->deathPipe[1], process->d_func()->symbianProcess);
+
+    CProcessActive* newActive =
+        CProcessActive::construct(process,
+                                  &(process->d_func()->symbianProcess),
+                                  serial,
+                                  process->d_func()->deathPipe[1]);
+
+    if (newActive){
+        if (mediator->add(newActive)) {
+            children.insert(serial, newActive);
+            unlock();
+            return true;
+        } else {
+            QPROCESS_DEBUG_PRINT("QProcessManager::add(): Failed to add CProcessActive to ProcessManager");
+            delete newActive;
+        }
+    }
+
+    unlock();
+
+    return false;
+}
+
+void QProcessManager::remove(QProcess *process)
+{
+    QPROCESS_ASSERT(process,
+        EProcessManagerNullParam,
+        "QProcessManager::remove(): Failed to remove CProcessActive from ProcessManager - NULL process")
+
+    lock();
+
+    int serial = process->d_func()->serial;
+    CProcessActive *active = children.value(serial);
+    if (!active) {
+        unlock();
+        return;
+    }
+
+    mediator->remove(active);
+
+    children.remove(serial);
+    delete active;
+
+    unlock();
+}
+
+void QProcessPrivate::destroyPipe(int *pipe)
+{
+    if (pipe[1] != -1) {
+        qt_native_close(pipe[1]);
+        pipe[1] = -1;
+    }
+    if (pipe[0] != -1) {
+        qt_native_close(pipe[0]);
+        pipe[0] = -1;
+    }
+}
+
+bool QProcessPrivate::createChannel(Channel &channel)
+{
+    Q_UNUSED(channel);
+    // No channels used
+    return false;
+}
+
+void QProcessPrivate::startProcess()
+{
+    Q_Q(QProcess);
+
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::startProcess()");
+
+    // Start the process (platform dependent)
+    q->setProcessState(QProcess::Starting);
+
+    processManager()->startThread();
+
+    qt_create_pipe(deathPipe);
+    if (threadData->eventDispatcher) {
+        deathNotifier = new QSocketNotifier(deathPipe[0],
+                                            QSocketNotifier::Read, q);
+        QObject::connect(deathNotifier, SIGNAL(activated(int)),
+                         q, SLOT(_q_processDied()));
+    }
+
+    TInt err = qt_create_symbian_process(&symbianProcess, program, arguments);
+
+    if (err == KErrNone) {
+        pid = symbianProcess->Id();
+
+        ::fcntl(deathPipe[0], F_SETFL, ::fcntl(deathPipe[0], F_GETFL) | O_NONBLOCK);
+
+        if (!processManager()->add(q)) {
+            qWarning("QProcessPrivate::startProcess(): Failed to start monitoring for process death.");
+            err = KErrNoMemory;
+        }
+    }
+
+    if (err != KErrNone) {
+        // Cleanup, report error and return
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::startProcess() Process open failed, err: %d, '%s'", err, qPrintable(program));
+        q->setProcessState(QProcess::NotRunning);
+        processError = QProcess::FailedToStart;
+        q->setErrorString(QLatin1String(QT_TRANSLATE_NOOP(QProcess, "Resource error (qt_create_symbian_process failure)")));
+        emit q->error(processError);
+        cleanup();
+        return;
+    }
+
+    processLaunched = true;
+
+    symbianProcess->Resume();
+
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::startProcess(): this: 0x%x, pid: %d", this, (TUint)pid);
+
+    // Notify child start
+    _q_startupNotification();
+
+}
+
+bool QProcessPrivate::processStarted()
+{
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::processStarted() == %s", processLaunched ? "true" : "false");
+
+    // Since we cannot get information whether process has actually been launched
+    // or not in Symbian, we need to fake it. Assume process is started if launch was
+    // successful.
+
+    return processLaunched;
+}
+
+qint64 QProcessPrivate::bytesAvailableFromStdout() const
+{
+    // In Symbian, zero bytes are always available
+    return 0;
+}
+
+qint64 QProcessPrivate::bytesAvailableFromStderr() const
+{
+    // In Symbian, zero bytes are always available
+    return 0;
+}
+
+qint64 QProcessPrivate::readFromStdout(char *data, qint64 maxlen)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(maxlen);
+    // In Symbian, zero bytes are always read
+    return 0;
+}
+
+qint64 QProcessPrivate::readFromStderr(char *data, qint64 maxlen)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(maxlen);
+    // In Symbian, zero bytes are always read
+    return 0;
+}
+
+qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(maxlen);
+    // In Symbian, zero bytes are always written
+    return 0;
+}
+
+void QProcessPrivate::terminateProcess()
+{
+    // Not allowed by platform security - will panic kern-exec 46 if process has been started.
+    // Works if process is not yet started.
+    if (qt_rprocess_running(symbianProcess)) {
+        symbianProcess->Terminate(0);
+    } else {
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::terminateProcess(), Process not running");
+    }
+}
+
+void QProcessPrivate::killProcess()
+{
+    // Not allowed by platform security - will panic kern-exec 46 if process has been started.
+    // Works if process is not yet started.
+    if (qt_rprocess_running(symbianProcess)) {
+        symbianProcess->Kill(0);
+    } else {
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::killProcess(), Process not running");
+    }
+}
+
+bool QProcessPrivate::waitForStarted(int msecs)
+{
+    Q_UNUSED(msecs);
+    // Since we can get no actual feedback from process beyond its death,
+    // assume that started has already been emitted if process has been launched
+    return processLaunched;
+}
+
+bool QProcessPrivate::waitForReadyRead(int msecs)
+{
+    // Functionality not supported in Symbian
+    Q_UNUSED(msecs);
+    return false;
+}
+
+bool QProcessPrivate::waitForBytesWritten(int msecs)
+{
+    // Functionality not supported in Symbian
+    Q_UNUSED(msecs);
+    return false;
+}
+
+bool QProcessPrivate::waitForFinished(int msecs)
+{
+    Q_Q(QProcess);
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished(%d)", msecs);
+
+    TRequestStatus timerStatus = 0;
+    TRequestStatus logonStatus = 0;
+    bool timeoutOccurred = false;
+
+    // Logon to process to observe its death
+    if (qt_rprocess_running(symbianProcess)) {
+        symbianProcess->Logon(logonStatus);
+
+        // Create timer
+        RTimer timer;
+        timer.CreateLocal();
+        TTimeIntervalMicroSeconds32 interval(msecs*1000);
+        timer.After(timerStatus, interval);
+
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished() - Waiting...");
+        User::WaitForRequest(logonStatus, timerStatus);
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished() - Wait completed");
+
+        if (timerStatus == KErrNone) {
+            timeoutOccurred = true;
+        }
+
+        timer.Cancel();
+        timer.Close();
+
+        symbianProcess->LogonCancel(logonStatus);
+
+        // Eat cancel request completion so that it won't mess up main thread scheduling later
+        User::WaitForRequest(logonStatus, timerStatus);
+    } else {
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished(), qt_rprocess_running returned false");
+    }
+
+	if (timeoutOccurred) {
+	    processError = QProcess::Timedout;
+	    q->setErrorString(QLatin1String(QT_TRANSLATE_NOOP(QProcess, "Process operation timed out")));
+	    return false;
+	}
+
+    _q_processDied();
+
+    return true;
+}
+
+bool QProcessPrivate::waitForWrite(int msecs)
+{
+    // Functionality not supported in Symbian
+    Q_UNUSED(msecs);
+    return false;
+}
+
+// Deceptively named function. Exit code is actually got in waitForDeadChild().
+void QProcessPrivate::findExitCode()
+{
+    Q_Q(QProcess);
+    processManager()->remove(q);
+}
+
+bool QProcessPrivate::waitForDeadChild()
+{
+    Q_Q(QProcess);
+
+    // read a byte from the death pipe
+    char c;
+    qt_native_read(deathPipe[0], &c, 1);
+
+    if (symbianProcess && symbianProcess->Handle()) {
+        TExitType et = symbianProcess->ExitType();
+        QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForDeadChild() symbianProcess->ExitType: %d", et);
+        if (et != EExitPending) {
+            processManager()->remove(q);
+            exitCode = symbianProcess->ExitReason();
+            crashed = (et == EExitPanic);
+#if defined QPROCESS_DEBUG
+            TExitCategoryName catName = symbianProcess->ExitCategory();
+            qDebug() << "QProcessPrivate::waitForDeadChild() dead with exitCode"
+                     << exitCode << ", crashed:" << crashed
+                     << ", category:" << QString::fromUtf16(catName.Ptr());
+#endif
+        } else {
+            QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForDeadChild() not dead!");
+        }
+    }
+
+    return true;
+}
+
+void QProcessPrivate::_q_notified()
+{
+    // Nothing to do in Symbian
+}
+
+/*! \internal
+ */
+bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, qint64 *pid)
+{
+    QPROCESS_DEBUG_PRINT("QProcessPrivate::startDetached()");
+    Q_UNUSED(workingDirectory);
+
+    RProcess* newProc = NULL;
+
+    TInt err = qt_create_symbian_process(&newProc, program, arguments);
+
+    if (err == KErrNone) {
+        if (pid) {
+            *pid = (qint64)newProc->Id();
+        }
+
+        newProc->Resume();
+        newProc->Close();
+        return true;
+    }
+
+    return false;
+}
+
+
+void QProcessPrivate::initializeProcessManager()
+{
+    (void) processManager();
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_PROCESS
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 242af61..ff1a31f 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -318,9 +318,8 @@ QResourcePrivate::ensureInitialized() const
     if(path.startsWith(QLatin1Char(':')))
         path = path.mid(1);
 
-    bool found = false;
     if(path.startsWith(QLatin1Char('/'))) {
-        found = that->load(path);
+        that->load(path);
     } else {
         QMutexLocker lock(resourceMutex());
         QStringList searchPaths = *resourceSearchPaths();
@@ -328,7 +327,6 @@ QResourcePrivate::ensureInitialized() const
         for(int i = 0; i < searchPaths.size(); ++i) {
             const QString searchPath(searchPaths.at(i) + QLatin1Char('/') + path);
             if(that->load(searchPath)) {
-                found = true;
                 that->absoluteFilePath = QLatin1Char(':') + searchPath;
                 break;
             }
@@ -390,7 +388,6 @@ QResource::QResource(const QString &file, const QLocale &locale) : d_ptr(new QRe
 */
 QResource::~QResource()
 {
-    delete d_ptr;
 }
 
 /*!
diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h
index a162391..dc2df92 100644
--- a/src/corelib/io/qresource.h
+++ b/src/corelib/io/qresource.h
@@ -91,7 +91,7 @@ protected:
     QStringList children() const;
 
 protected:
-    QResourcePrivate *d_ptr;
+    QScopedPointer<QResourcePrivate> d_ptr;
 
 private:
     Q_DECLARE_PRIVATE(QResource)
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index af38b5a..4c19cbf 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -221,6 +221,11 @@ QConfFile::QConfFile(const QString &fileName, bool _userPerms)
     usedHashFunc()->insert(name, this);
 }
 
+QConfFile::~QConfFile()
+{
+    usedHashFunc()->remove(name);
+}
+
 ParsedSettingsMap QConfFile::mergedKeyMap() const
 {
     ParsedSettingsMap result = originalKeys;
@@ -267,7 +272,7 @@ QConfFile *QConfFile::fromName(const QString &fileName, bool _userPerms)
     ConfFileHash *usedHash = usedHashFunc();
     ConfFileCache *unusedCache = unusedCacheFunc();
 
-    QConfFile *confFile;
+    QConfFile *confFile = 0;
     QMutexLocker locker(globalMutex());
 
     if (!(confFile = usedHash->value(absPath))) {
@@ -1093,10 +1098,10 @@ static QString getPath(QSettings::Format format, QSettings::Scope scope)
     QString homePath = QDir::homePath();
     QString systemPath;
 
-    globalMutex()->lock();
+    QMutexLocker locker(globalMutex());
     PathHash *pathHash = pathHashFunc();
     bool loadSystemPath = pathHash->isEmpty();
-    globalMutex()->unlock();
+    locker.unlock();
 
     if (loadSystemPath) {
         /*
@@ -1108,7 +1113,7 @@ static QString getPath(QSettings::Format format, QSettings::Scope scope)
         systemPath += QLatin1Char('/');
     }
 
-    QMutexLocker locker(globalMutex());
+    locker.relock();
     if (pathHash->isEmpty()) {
         /*
            Lazy initialization of pathHash. We initialize the
@@ -1168,9 +1173,6 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
     int i;
     initFormat();
 
-    for (i = 0; i < NumConfFiles; ++i)
-        confFiles[i] = 0;
-
     QString org = organization;
     if (org.isEmpty()) {
         setStatus(QSettings::AccessError);
@@ -1183,14 +1185,14 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
     if (scope == QSettings::UserScope) {
         QString userPath = getPath(format, QSettings::UserScope);
         if (!application.isEmpty())
-            confFiles[F_User | F_Application] = QConfFile::fromName(userPath + appFile, true);
-        confFiles[F_User | F_Organization] = QConfFile::fromName(userPath + orgFile, true);
+            confFiles[F_User | F_Application].reset(QConfFile::fromName(userPath + appFile, true));
+        confFiles[F_User | F_Organization].reset(QConfFile::fromName(userPath + orgFile, true));
     }
 
     QString systemPath = getPath(format, QSettings::SystemScope);
     if (!application.isEmpty())
-        confFiles[F_System | F_Application] = QConfFile::fromName(systemPath + appFile, false);
-    confFiles[F_System | F_Organization] = QConfFile::fromName(systemPath + orgFile, false);
+        confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
+    confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
 
     for (i = 0; i < NumConfFiles; ++i) {
         if (confFiles[i]) {
@@ -1209,9 +1211,7 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(const QString &fileName,
 {
     initFormat();
 
-    confFiles[0] = QConfFile::fromName(fileName, true);
-    for (int i = 1; i < NumConfFiles; ++i)
-        confFiles[i] = 0;
+    confFiles[0].reset(QConfFile::fromName(fileName, true));
 
     initAccess();
 }
@@ -1224,23 +1224,30 @@ QConfFileSettingsPrivate::~QConfFileSettingsPrivate()
 
     for (int i = 0; i < NumConfFiles; ++i) {
         if (confFiles[i] && !confFiles[i]->ref.deref()) {
-            if (usedHash)
-                usedHash->remove(confFiles[i]->name);
-
             if (confFiles[i]->size == 0) {
-                delete confFiles[i];
+                delete confFiles[i].take();
             } else if (unusedCache) {
-                // compute a better size?
-                unusedCache->insert(confFiles[i]->name, confFiles[i],
+                if (usedHash)
+                    usedHash->remove(confFiles[i]->name);
+                QT_TRY {
+                    // compute a better size?
+                    unusedCache->insert(confFiles[i]->name, confFiles[i].data(),
                                     10 + (confFiles[i]->originalKeys.size() / 4));
+                    confFiles[i].take();
+                } QT_CATCH(...) {
+                    // out of memory. Do not cache the file.
+                    delete confFiles[i].take();
+                }
             }
         }
+        // prevent the ScopedPointer to deref it again.
+        confFiles[i].take();
     }
 }
 
 void QConfFileSettingsPrivate::remove(const QString &key)
 {
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return;
 
@@ -1267,7 +1274,7 @@ void QConfFileSettingsPrivate::remove(const QString &key)
 
 void QConfFileSettingsPrivate::set(const QString &key, const QVariant &value)
 {
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return;
 
@@ -1284,7 +1291,7 @@ bool QConfFileSettingsPrivate::get(const QString &key, QVariant *value) const
     bool found = false;
 
     for (int i = 0; i < NumConfFiles; ++i) {
-        if (QConfFile *confFile = confFiles[i]) {
+        if (QConfFile *confFile = confFiles[i].data()) {
             QMutexLocker locker(&confFile->mutex);
 
             if (!confFile->addedKeys.isEmpty()) {
@@ -1319,7 +1326,7 @@ QStringList QConfFileSettingsPrivate::children(const QString &prefix, ChildSpec
     int startPos = prefix.size();
 
     for (int i = 0; i < NumConfFiles; ++i) {
-        if (QConfFile *confFile = confFiles[i]) {
+        if (QConfFile *confFile = confFiles[i].data()) {
             QMutexLocker locker(&confFile->mutex);
 
             if (thePrefix.isEmpty()) {
@@ -1352,7 +1359,7 @@ QStringList QConfFileSettingsPrivate::children(const QString &prefix, ChildSpec
 
 void QConfFileSettingsPrivate::clear()
 {
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return;
 
@@ -1368,7 +1375,7 @@ void QConfFileSettingsPrivate::sync()
     // error we just try to go on and make the best of it
 
     for (int i = 0; i < NumConfFiles; ++i) {
-        QConfFile *confFile = confFiles[i];
+        QConfFile *confFile = confFiles[i].data();
         if (confFile) {
             QMutexLocker locker(&confFile->mutex);
             syncConfFile(i);
@@ -1383,7 +1390,7 @@ void QConfFileSettingsPrivate::flush()
 
 QString QConfFileSettingsPrivate::fileName() const
 {
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return QString();
     return confFile->name;
@@ -1394,7 +1401,7 @@ bool QConfFileSettingsPrivate::isWritable() const
     if (format > QSettings::IniFormat && !writeFunc)
         return false;
 
-    QConfFile *confFile = confFiles[spec];
+    QConfFile *confFile = confFiles[spec].data();
     if (!confFile)
         return false;
 
@@ -1403,7 +1410,7 @@ bool QConfFileSettingsPrivate::isWritable() const
 
 void QConfFileSettingsPrivate::syncConfFile(int confFileNo)
 {
-    QConfFile *confFile = confFiles[confFileNo];
+    QConfFile *confFile = confFiles[confFileNo].data();
     bool readOnly = confFile->addedKeys.isEmpty() && confFile->removedKeys.isEmpty();
     bool ok;
 
@@ -2737,11 +2744,13 @@ QSettings::QSettings(const QString &fileName, Format format)
 QSettings::~QSettings()
 {
     Q_D(QSettings);
-    if (d->pendingChanges)
-        d->flush();
-#ifdef QT_NO_QOBJECT
-    delete d;
-#endif
+    if (d->pendingChanges) {
+        QT_TRY {
+            d->flush();
+        } QT_CATCH(...) {
+            ; // ok. then don't flush but at least don't throw in the destructor
+        }
+    }
 }
 
 /*!
@@ -3544,8 +3553,7 @@ void QSettings::setPath_helper(Scope scope, const QString &organization, const Q
     QSettingsPrivate *oldPriv = d;
     QSettingsPrivate *newPriv = QSettingsPrivate::create(oldPriv->format, scope, organization, application);
     static_cast<QObjectPrivate &>(*newPriv) = static_cast<QObjectPrivate &>(*oldPriv);  // copy the QObject stuff over (hack)
-    delete oldPriv;
-    d_ptr = newPriv;
+    d_ptr.reset(newPriv);
 }
 
 /*! \fn bool QSettings::writeEntry(const QString &key, bool value)
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h
index 23ff273..a1ce361 100644
--- a/src/corelib/io/qsettings.h
+++ b/src/corelib/io/qsettings.h
@@ -78,7 +78,7 @@ class Q_CORE_EXPORT QSettings
 #ifndef QT_NO_QOBJECT
     Q_OBJECT
 #else
-    QSettingsPrivate *d_ptr;
+    QScopedPointer<QSettingsPrivate> d_ptr;
 #endif
     Q_DECLARE_PRIVATE(QSettings)
 
diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h
index 90ba8d5..8811544 100644
--- a/src/corelib/io/qsettings_p.h
+++ b/src/corelib/io/qsettings_p.h
@@ -149,6 +149,8 @@ inline QString QSettingsGroup::toString() const
 class Q_AUTOTEST_EXPORT QConfFile
 {
 public:
+    ~QConfFile();
+
     ParsedSettingsMap mergedKeyMap() const;
     bool isWritable() const;
 
@@ -300,7 +302,7 @@ private:
     void ensureAllSectionsParsed(QConfFile *confFile) const;
     void ensureSectionParsed(QConfFile *confFile, const QSettingsKey &key) const;
 
-    QConfFile *confFiles[NumConfFiles];
+    QScopedSharedPointer<QConfFile> confFiles[NumConfFiles];
     QSettings::ReadFunc readFunc;
     QSettings::WriteFunc writeFunc;
     QString extension;
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index adfcf5e..d76e99b 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -514,6 +514,10 @@ QTemporaryFile::QTemporaryFile()
 {
     Q_D(QTemporaryFile);
     d->templateName = QDir::tempPath() + QLatin1String("/qt_temp.XXXXXX");
+#ifdef Q_OS_SYMBIAN
+    //Just for verify that folder really exist on hardware
+    fileEngine()->mkdir( QDir::tempPath(), true  );
+#endif
 }
 
 /*!
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 9c82976..ad0a67d 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -1114,9 +1114,6 @@ QTextStream::~QTextStream()
 #endif
     if (!d->writeBuffer.isEmpty())
         d->flushWriteBuffer();
-
-    delete d;
-    d_ptr = 0;
 }
 
 /*!
diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h
index 5fa6afa..ddf5f69 100644
--- a/src/corelib/io/qtextstream.h
+++ b/src/corelib/io/qtextstream.h
@@ -46,6 +46,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qchar.h>
 #include <QtCore/qlocale.h>
+#include <QtCore/qscopedpointer.h>
 
 #ifndef QT_NO_TEXTCODEC
 #  ifdef QT3_SUPPORT
@@ -256,7 +257,7 @@ private:
 
     Q_DISABLE_COPY(QTextStream)
 
-    QTextStreamPrivate *d_ptr;
+    QScopedPointer<QTextStreamPrivate> d_ptr;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTextStream::NumberFlags)