Merge branch '4.8-upstream' into master-water

12 files changed, 289 insertions, 124 deletions

diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 4ba8e06..48b9358 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -1872,7 +1872,10 @@ 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(). On Symbian always the same as the path returned by the rootPath().
+    rootPath().
+
+    On Symbian this typically returns "c:/data",
+    i.e. the same as native PathInfo::PhoneMemoryRootPath().
 
     \sa home(), currentPath(), rootPath(), tempPath()
 */
@@ -1936,9 +1939,8 @@ QString QDir::tempPath()
 /*!
     Returns the absolute path of the root directory.
 
-    For Unix operating systems this returns "/". For Windows file
-    systems this normally returns "c:/". On Symbian this typically returns
-    "c:/data", i.e. the same as native PathInfo::PhoneMemoryRootPath().
+    For Unix operating systems this returns "/". For Windows and Symbian file
+    systems this normally returns "c:/". I.E. the root of the system drive.
 
     \sa root(), drives(), currentPath(), homePath(), tempPath()
 */
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 06c403a..d08574d 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -1332,6 +1332,13 @@ bool QFile::open(const RFile &f, OpenMode mode, FileHandleFlags handleFlags)
 
   This function is not supported on Windows CE.
 
+  On Symbian, this function returns -1 if the file was opened normally,
+  as Symbian OS native file handles do not fit in an int, and are
+  incompatible with C library functions that the handle would be used for.
+  If the file was opened using the overloads that take an open C library
+  file handle / file descriptor, then this function returns that same
+  handle.
+
   \sa QSocketNotifier
 */
 
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
index 338552c..86b9496 100644
--- a/src/corelib/io/qfilesystemengine_win.cpp
+++ b/src/corelib/io/qfilesystemengine_win.cpp
@@ -694,7 +694,7 @@ bool QFileSystemEngine::fillPermissions(const QFileSystemEntry &entry, QFileSyst
         if (what & QFileSystemMetaData::UserWritePermission) {
             if (::_waccess((wchar_t*)entry.nativeFilePath().utf16(), W_OK) == 0)
                 data.entryFlags |= QFileSystemMetaData::UserWritePermission;
-            data.knownFlagsMask |= QFileSystemMetaData::UserReadPermission;
+            data.knownFlagsMask |= QFileSystemMetaData::UserWritePermission;
         }
     }
 
diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
index 63cc4f1..fa857c6 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian.cpp
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -52,7 +52,7 @@
 QT_BEGIN_NAMESPACE
 
 QNotifyChangeEvent::QNotifyChangeEvent(RFs &fs, const TDesC &file,
-                                       QSymbianFileSystemWatcherEngine *e, bool aIsDir,
+                                       QSymbianFileSystemWatcherInterface *e, bool aIsDir,
 									   TInt aPriority) :
         CActive(aPriority),
         isDir(aIsDir),
@@ -96,9 +96,9 @@ void QNotifyChangeEvent::RunL()
 
         if (!failureCount) {
             int err;
-            QT_TRYCATCH_ERROR(err, engine->emitPathChanged(this));
+            QT_TRYCATCH_ERROR(err, engine->handlePathChanged(this));
             if (err != KErrNone)
-                qWarning("QNotifyChangeEvent::RunL() - emitPathChanged threw exception (Converted error code: %d)", err);
+                qWarning("QNotifyChangeEvent::RunL() - handlePathChanged threw exception (Converted error code: %d)", err);
         }
     }
 }
@@ -203,7 +203,7 @@ QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &path
     return p;
 }
 
-void QSymbianFileSystemWatcherEngine::emitPathChanged(QNotifyChangeEvent *e)
+void QSymbianFileSystemWatcherEngine::handlePathChanged(QNotifyChangeEvent *e)
 {
     QMutexLocker locker(&mutex);
 
@@ -255,7 +255,7 @@ void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directory
     QMutexLocker locker(&mutex);
     QString nativeDir(QDir::toNativeSeparators(directoryPath));
     TPtrC ptr(qt_QString2TPtrC(nativeDir));
-    currentAddEvent = new QNotifyChangeEvent(qt_s60GetRFs(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
+    currentAddEvent = q_check_ptr(new QNotifyChangeEvent(qt_s60GetRFs(), ptr, this, directoryPath.endsWith(QChar(L'/'))));
     syncCondition.wakeOne();
 }
 
diff --git a/src/corelib/io/qfilesystemwatcher_symbian_p.h b/src/corelib/io/qfilesystemwatcher_symbian_p.h
index 0b317a0..842df80 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian_p.h
+++ b/src/corelib/io/qfilesystemwatcher_symbian_p.h
@@ -66,29 +66,35 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSymbianFileSystemWatcherEngine;
+class QSymbianFileSystemWatcherInterface;
 
 class QNotifyChangeEvent : public CActive
 {
 public:
-    QNotifyChangeEvent(RFs &fsSession, const TDesC &file, QSymbianFileSystemWatcherEngine *engine,
+    QNotifyChangeEvent(RFs &fsSession, const TDesC &file, QSymbianFileSystemWatcherInterface *engine,
                        bool aIsDir, TInt aPriority = EPriorityStandard);
     ~QNotifyChangeEvent();
 
     bool isDir;
+    TPath watchedPath;
 
 private:
     void RunL();
     void DoCancel();
 
     RFs &fsSession;
-    TPath watchedPath;
-    QSymbianFileSystemWatcherEngine *engine;
+    QSymbianFileSystemWatcherInterface *engine;
 
     int failureCount;
 };
 
-class QSymbianFileSystemWatcherEngine : public QFileSystemWatcherEngine
+class QSymbianFileSystemWatcherInterface
+{
+public:
+    virtual void handlePathChanged(QNotifyChangeEvent *e) = 0;
+};
+
+class QSymbianFileSystemWatcherEngine : public QFileSystemWatcherEngine, public QSymbianFileSystemWatcherInterface
 {
     Q_OBJECT
 
@@ -111,7 +117,7 @@ public Q_SLOTS:
 
 private:
     friend class QNotifyChangeEvent;
-    void emitPathChanged(QNotifyChangeEvent *e);
+    void handlePathChanged(QNotifyChangeEvent *e);
 
     void startWatcher();
 
diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp
index 04acfb0..57ae2af 100644
--- a/src/corelib/kernel/qcore_symbian_p.cpp
+++ b/src/corelib/kernel/qcore_symbian_p.cpp
@@ -45,6 +45,7 @@
 #include "qcore_symbian_p.h"
 #include <string>
 #include <in_sock.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -115,6 +116,24 @@ public:
     QS60RFsSession() {
         qt_symbian_throwIfError(iFs.Connect());
         qt_symbian_throwIfError(iFs.ShareProtected());
+        //BC with 4.7: create private path on system drive
+        TInt sysdrive = iFs.GetSystemDrive();
+        TInt err = iFs.CreatePrivatePath(sysdrive);
+        if (err != KErrNone && err != KErrAlreadyExists)
+            qWarning("Failed to create private path on system drive.");
+        //BC with 4.7: set working directory to same drive as application
+        TFileName pfn = RProcess().FileName();
+        TInt drive;
+        if (pfn.Length() > 0 && iFs.CharToDrive(pfn[0], drive) == KErrNone) {
+            // for system drive or rom based apps, leave the path on system drive
+            if (drive != sysdrive && drive != EDriveZ) {
+                err = iFs.CreatePrivatePath(drive);
+                if (err == KErrNone || err == KErrAlreadyExists)
+                    iFs.SetSessionToPrivate(drive);
+                else
+                    qWarning("Failed to create private path on application drive.");
+            }
+        }
     }
 
     ~QS60RFsSession() {
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 752bbaa..2eb68f7 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1991,12 +1991,6 @@ QString QCoreApplication::applicationDirPath()
         appPath = qt_TDesC2QString(privatePath);
         appPath.prepend(QLatin1Char(':')).prepend(qDriveChar);
 
-        // Create the appPath if it doesn't exist. Non-existing appPath will cause
-        // Platform Security violations later on if the app doesn't have AllFiles capability.
-        err = fs.CreatePrivatePath(drive);
-        if (err != KErrNone)
-            qWarning("QCoreApplication::applicationDirPath: Failed to create private path.");
-
         d->cachedApplicationDirPath = QFileInfo(appPath).path();
     }
 #else
@@ -2335,6 +2329,33 @@ QString QCoreApplication::applicationVersion()
 
 #ifndef QT_NO_LIBRARY
 
+#if defined(Q_OS_SYMBIAN)
+void qt_symbian_installLibraryPaths(QString installPathPlugins, QStringList& libPaths)
+{
+    // Add existing path on all drives for relative PluginsPath in Symbian
+    QString tempPath = installPathPlugins;
+    if (tempPath.at(tempPath.length() - 1) != QDir::separator()) {
+        tempPath += QDir::separator();
+    }
+    RFs& fs = qt_s60GetRFs();
+    TPtrC tempPathPtr(reinterpret_cast<const TText*> (tempPath.constData()));
+    // Symbian searches should start from Y:. Fix start drive otherwise TFindFile starts from the session drive
+    _LIT(KStartDir, "Y:");
+    TFileName dirPath(KStartDir);
+    dirPath.Append(tempPathPtr);
+    TFindFile finder(fs);
+    TInt err = finder.FindByDir(tempPathPtr, dirPath);
+    while (err == KErrNone) {
+        QString foundDir(reinterpret_cast<const QChar *>(finder.File().Ptr()),
+                         finder.File().Length());
+        foundDir = QDir(foundDir).canonicalPath();
+        if (!libPaths.contains(foundDir))
+            libPaths.append(foundDir);
+        err = finder.Find();
+    }
+}
+#endif
+
 Q_GLOBAL_STATIC_WITH_ARGS(QMutex, libraryPathMutex, (QMutex::Recursive))
 
 /*!
@@ -2367,24 +2388,8 @@ QStringList QCoreApplication::libraryPaths()
         QStringList *app_libpaths = coreappdata()->app_libpaths = new QStringList;
         QString installPathPlugins =  QLibraryInfo::location(QLibraryInfo::PluginsPath);
 #if defined(Q_OS_SYMBIAN)
-        // Add existing path on all drives for relative PluginsPath in Symbian
         if (installPathPlugins.at(1) != QChar(QLatin1Char(':'))) {
-            QString tempPath = installPathPlugins;
-            if (tempPath.at(tempPath.length() - 1) != QDir::separator()) {
-                tempPath += QDir::separator();
-            }
-            RFs& fs = qt_s60GetRFs();
-            TPtrC tempPathPtr(reinterpret_cast<const TText*> (tempPath.constData()));
-            TFindFile finder(fs);
-            TInt err = finder.FindByDir(tempPathPtr, tempPathPtr);
-            while (err == KErrNone) {
-                QString foundDir(reinterpret_cast<const QChar *>(finder.File().Ptr()),
-                                 finder.File().Length());
-                foundDir = QDir(foundDir).canonicalPath();
-                if (!app_libpaths->contains(foundDir))
-                    app_libpaths->append(foundDir);
-                err = finder.Find();
-            }
+            qt_symbian_installLibraryPaths(installPathPlugins, *app_libpaths);
         }
 #else
         if (QFile::exists(installPathPlugins)) {
@@ -2499,6 +2504,36 @@ void QCoreApplication::removeLibraryPath(const QString &path)
     QFactoryLoader::refreshAll();
 }
 
+#if defined(Q_OS_SYMBIAN)
+void QCoreApplicationPrivate::rebuildInstallLibraryPaths()
+{
+    // check there is not a single fixed install path
+    QString nativeInstallPathPlugins =  QLibraryInfo::location(QLibraryInfo::PluginsPath);
+    if (nativeInstallPathPlugins.at(1) == QChar(QLatin1Char(':')))
+        return;
+    QString installPathPlugins = QDir::cleanPath(nativeInstallPathPlugins);
+    // look for the install path at the drive roots
+    installPathPlugins.prepend(QChar(QLatin1Char(':')));
+
+    QMutexLocker locker(libraryPathMutex());
+    QStringList &app_libpaths = *coreappdata()->app_libpaths;
+    // Build a new library path, copying non-installPath components, and replacing existing install path with new
+    QStringList newPaths;
+    bool installPathFound = false;
+    foreach (QString path, app_libpaths) {
+        if (path.mid(1).compare(installPathPlugins, Qt::CaseInsensitive) == 0) {
+            // skip existing install paths, insert new install path when we find the first
+            if (!installPathFound)
+                qt_symbian_installLibraryPaths(nativeInstallPathPlugins, newPaths);
+            installPathFound = true;
+        } else {
+            newPaths.append(path);
+        }
+    }
+    app_libpaths = newPaths;
+}
+#endif
+
 #endif //QT_NO_LIBRARY
 
 /*!
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index c6c6489..6f75da3 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -126,6 +126,9 @@ public:
     void symbianInit();
 #  endif
     static CApaCommandLine* symbianCommandLine();
+#ifndef QT_NO_LIBRARY
+    static void rebuildInstallLibraryPaths();
+#endif
 #endif
 
     static bool isTranslatorInstalled(QTranslator *translator);
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index c8831e5..24b4be0 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -50,8 +50,13 @@
 #include "qmutex.h"
 #include "qplugin.h"
 #include "qpluginloader.h"
+#include "qlibraryinfo.h"
 #include "private/qobject_p.h"
 #include "private/qcoreapplication_p.h"
+#ifdef Q_OS_SYMBIAN
+#include "private/qcore_symbian_p.h"
+#include "private/qfilesystemwatcher_symbian_p.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -59,6 +64,23 @@ Q_GLOBAL_STATIC(QList<QFactoryLoader *>, qt_factory_loaders)
 
 Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_factoryloader_mutex, (QMutex::Recursive))
 
+#ifdef Q_OS_SYMBIAN
+class QSymbianSystemPluginWatcher : public QSymbianFileSystemWatcherInterface
+{
+public:
+    QSymbianSystemPluginWatcher();
+    ~QSymbianSystemPluginWatcher();
+
+    void watchForUpdates();
+    void handlePathChanged(QNotifyChangeEvent *e);
+
+    QList<QNotifyChangeEvent*> watchers;
+    TDriveList drives;
+};
+
+Q_GLOBAL_STATIC(QSymbianSystemPluginWatcher, qt_symbian_system_plugin_watcher)
+#endif
+
 class QFactoryLoaderPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QFactoryLoader)
@@ -98,102 +120,117 @@ QFactoryLoader::QFactoryLoader(const char *iid,
     QMutexLocker locker(qt_factoryloader_mutex());
     update();
     qt_factory_loaders()->append(this);
+#ifdef Q_OS_SYMBIAN
+    // kick off Symbian plugin watcher for updates
+    qt_symbian_system_plugin_watcher();
+#endif
 }
 
 
-
-void QFactoryLoader::update()
+void QFactoryLoader::updateDir(const QString &pluginDir, QSettings& settings)
 {
-#ifdef QT_SHARED
     Q_D(QFactoryLoader);
-    QStringList paths = QCoreApplication::libraryPaths();
-    QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
-    for (int i = 0; i < paths.count(); ++i) {
-        const QString &pluginDir = paths.at(i);
-        // Already loaded, skip it...
-        if (d->loadedPaths.contains(pluginDir))
-            continue;
-        d->loadedPaths << pluginDir;
+    QString path = pluginDir + d->suffix;
+    if (!QDir(path).exists(QLatin1String(".")))
+        return;
 
-        QString path = pluginDir + d->suffix;
-        if (!QDir(path).exists(QLatin1String(".")))
-            continue;
+    QStringList plugins = QDir(path).entryList(QDir::Files);
+    QLibraryPrivate *library = 0;
+    for (int j = 0; j < plugins.count(); ++j) {
+        QString fileName = QDir::cleanPath(path + QLatin1Char('/') + plugins.at(j));
 
-        QStringList plugins = QDir(path).entryList(QDir::Files);
-        QLibraryPrivate *library = 0;
-        for (int j = 0; j < plugins.count(); ++j) {
-            QString fileName = QDir::cleanPath(path + QLatin1Char('/') + plugins.at(j));
+        if (qt_debug_component()) {
+            qDebug() << "QFactoryLoader::QFactoryLoader() looking at" << fileName;
+        }
+        library = QLibraryPrivate::findOrCreate(QFileInfo(fileName).canonicalFilePath());
+        if (!library->isPlugin(&settings)) {
             if (qt_debug_component()) {
-                qDebug() << "QFactoryLoader::QFactoryLoader() looking at" << fileName;
+                qDebug() << library->errorString;
+                qDebug() << "         not a plugin";
             }
-            library = QLibraryPrivate::findOrCreate(QFileInfo(fileName).canonicalFilePath());
-            if (!library->isPlugin(&settings)) {
+            library->release();
+            continue;
+        }
+        QString regkey = QString::fromLatin1("Qt Factory Cache %1.%2/%3:/%4")
+                         .arg((QT_VERSION & 0xff0000) >> 16)
+                         .arg((QT_VERSION & 0xff00) >> 8)
+                         .arg(QLatin1String(d->iid))
+                         .arg(fileName);
+        QStringList reg, keys;
+        reg = settings.value(regkey).toStringList();
+        if (reg.count() && library->lastModified == reg[0]) {
+            keys = reg;
+            keys.removeFirst();
+        } else {
+            if (!library->loadPlugin()) {
                 if (qt_debug_component()) {
                     qDebug() << library->errorString;
-                    qDebug() << "         not a plugin";
+                    qDebug() << "           could not load";
                 }
                 library->release();
                 continue;
             }
-            QString regkey = QString::fromLatin1("Qt Factory Cache %1.%2/%3:/%4")
-                             .arg((QT_VERSION & 0xff0000) >> 16)
-                             .arg((QT_VERSION & 0xff00) >> 8)
-                             .arg(QLatin1String(d->iid))
-                             .arg(fileName);
-            QStringList reg, keys;
-            reg = settings.value(regkey).toStringList();
-            if (reg.count() && library->lastModified == reg[0]) {
-                keys = reg;
-                keys.removeFirst();
-            } else {
-                if (!library->loadPlugin()) {
-                    if (qt_debug_component()) {
-                        qDebug() << library->errorString;
-                        qDebug() << "           could not load";
-                    }
-                    library->release();
-                    continue;
-                }
-                QObject *instance = library->instance();
-                if (!instance) {
-                    library->release();
-                    // ignore plugins that have a valid signature but cannot be loaded.
-                    continue;
-                }
-                QFactoryInterface *factory = qobject_cast<QFactoryInterface*>(instance);
-                if (instance && factory && instance->qt_metacast(d->iid))
-                    keys = factory->keys();
-                if (keys.isEmpty())
-                    library->unload();
-                reg.clear();
-                reg << library->lastModified;
-                reg += keys;
-                settings.setValue(regkey, reg);
-            }
-            if (qt_debug_component()) {
-                qDebug() << "keys" << keys;
-            }
-
-            if (keys.isEmpty()) {
+            QObject *instance = library->instance();
+            if (!instance) {
                 library->release();
+                // ignore plugins that have a valid signature but cannot be loaded.
                 continue;
             }
-            d->libraryList += library;
-            for (int k = 0; k < keys.count(); ++k) {
-                // first come first serve, unless the first
-                // library was built with a future Qt version,
-                // whereas the new one has a Qt version that fits
-                // better
-                QString key = keys.at(k);
-                if (!d->cs)
-                    key = key.toLower();
-                QLibraryPrivate *previous = d->keyMap.value(key);
-                if (!previous || (previous->qt_version > QT_VERSION && library->qt_version <= QT_VERSION)) {
-                    d->keyMap[key] = library;
-                    d->keyList += keys.at(k);
-                }
+            QFactoryInterface *factory = qobject_cast<QFactoryInterface*>(instance);
+            if (instance && factory && instance->qt_metacast(d->iid))
+                keys = factory->keys();
+            if (keys.isEmpty())
+                library->unload();
+            reg.clear();
+            reg << library->lastModified;
+            reg += keys;
+            settings.setValue(regkey, reg);
+        }
+        if (qt_debug_component()) {
+            qDebug() << "keys" << keys;
+        }
+
+        if (keys.isEmpty()) {
+            library->release();
+            continue;
+        }
+
+        int keysUsed = 0;
+        for (int k = 0; k < keys.count(); ++k) {
+            // first come first serve, unless the first
+            // library was built with a future Qt version,
+            // whereas the new one has a Qt version that fits
+            // better
+            QString key = keys.at(k);
+            if (!d->cs)
+                key = key.toLower();
+            QLibraryPrivate *previous = d->keyMap.value(key);
+            if (!previous || (previous->qt_version > QT_VERSION && library->qt_version <= QT_VERSION)) {
+                d->keyMap[key] = library;
+                d->keyList += keys.at(k);
+                keysUsed++;
             }
         }
+        if (keysUsed)
+            d->libraryList += library;
+        else
+            library->release();
+    }
+}
+
+void QFactoryLoader::update()
+{
+#ifdef QT_SHARED
+    Q_D(QFactoryLoader);
+    QStringList paths = QCoreApplication::libraryPaths();
+    QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+    for (int i = 0; i < paths.count(); ++i) {
+        const QString &pluginDir = paths.at(i);
+        // Already loaded, skip it...
+        if (d->loadedPaths.contains(pluginDir))
+            continue;
+        d->loadedPaths << pluginDir;
+        updateDir(pluginDir, settings);
     }
 #else
     Q_D(QFactoryLoader);
@@ -264,6 +301,56 @@ void QFactoryLoader::refreshAll()
     }
 }
 
+#ifdef Q_OS_SYMBIAN
+QSymbianSystemPluginWatcher::QSymbianSystemPluginWatcher()
+{
+    qt_s60GetRFs().DriveList(drives);
+    watchForUpdates();
+}
+
+QSymbianSystemPluginWatcher::~QSymbianSystemPluginWatcher()
+{
+    qDeleteAll(watchers);
+}
+
+void QSymbianSystemPluginWatcher::watchForUpdates()
+{
+    QString installPathPlugins =  QLibraryInfo::location(QLibraryInfo::PluginsPath);
+    if (installPathPlugins.at(1) == QChar(QLatin1Char(':')))
+        return;
+
+    installPathPlugins.prepend(QLatin1String("?:"));
+    installPathPlugins = QDir::toNativeSeparators(installPathPlugins);
+    RFs& fs = qt_s60GetRFs();
+    for (int i=0; i<KMaxDrives; i++) {
+        int attr = drives[i];
+        if ((attr & KDriveAttLocal) && !(attr & KDriveAttRom)) {
+            // start new watcher
+            TChar driveLetter;
+            fs.DriveToChar(i, driveLetter);
+            installPathPlugins[0] = driveLetter;
+            TPtrC ptr(qt_QString2TPtrC(installPathPlugins));
+            QNotifyChangeEvent *event = q_check_ptr(new QNotifyChangeEvent(fs, ptr, this, true));
+            watchers.push_back(event);
+        }
+    }
+}
+
+void QSymbianSystemPluginWatcher::handlePathChanged(QNotifyChangeEvent *e)
+{
+    QCoreApplicationPrivate::rebuildInstallLibraryPaths();
+    QMutexLocker locker(qt_factoryloader_mutex());
+    QString dirName(QDir::cleanPath(qt_TDesC2QString(e->watchedPath)));
+    QList<QFactoryLoader *> *loaders = qt_factory_loaders();
+    for (QList<QFactoryLoader *>::const_iterator it = loaders->constBegin();
+         it != loaders->constEnd(); ++it) {
+        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+        (*it)->updateDir(dirName, settings);
+    }
+}
+
+#endif
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_LIBRARY
diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h
index e90ebf6..8548ab2 100644
--- a/src/corelib/plugin/qfactoryloader_p.h
+++ b/src/corelib/plugin/qfactoryloader_p.h
@@ -82,6 +82,7 @@ public:
 #endif
 
     void update();
+    void updateDir(const QString &pluginDir, QSettings& settings);
 
     static void refreshAll();
 };
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index bbb64e4..9f9ea1a 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -198,7 +198,7 @@ QPluginLoader::~QPluginLoader()
 */
 QObject *QPluginLoader::instance()
 {
-    if (!isLoaded() && !load())
+    if (!load())
         return 0;
     if (!d->inst && d->instance)
         d->inst = d->instance();
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index 0f67652..9c7c243 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -302,10 +302,15 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
 
 #endif // QT_NO_DATASTREAM
 
+inline static qreal q_deg2rad(qreal x)
+{
+    return x * qreal(0.01745329251994329576923690768489);    /* pi/180 */
+}
 
-#ifndef M_2PI
-#define M_2PI 6.28318530717958647692528676655900576
-#endif
+inline static qreal q_rad2deg(qreal x)
+{
+    return x * qreal(57.295779513082320876798154814105);    /* 180/pi */
+}
 
 /*!
     \class QLineF
@@ -575,7 +580,7 @@ qreal QLineF::angle() const
     const qreal dx = pt2.x() - pt1.x();
     const qreal dy = pt2.y() - pt1.y();
 
-    const qreal theta = qAtan2(-dy, dx) * 360.0 / M_2PI;
+    const qreal theta = q_rad2deg(qAtan2(-dy, dx));
 
     const qreal theta_normalized = theta < 0 ? theta + 360 : theta;
 
@@ -599,7 +604,7 @@ qreal QLineF::angle() const
 */
 void QLineF::setAngle(qreal angle)
 {
-    const qreal angleR = angle * M_2PI / 360.0;
+    const qreal angleR = q_deg2rad(angle);
     const qreal l = length();
 
     const qreal dx = qCos(angleR) * l;
@@ -621,7 +626,7 @@ void QLineF::setAngle(qreal angle)
 */
 QLineF QLineF::fromPolar(qreal length, qreal angle)
 {
-    const qreal angleR = angle * M_2PI / 360.0;
+    const qreal angleR = q_deg2rad(angle);
     return QLineF(0, 0, qCos(angleR) * length, -qSin(angleR) * length);
 }
 
@@ -815,8 +820,8 @@ qreal QLineF::angle(const QLineF &l) const
     qreal cos_line = (dx()*l.dx() + dy()*l.dy()) / (length()*l.length());
     qreal rad = 0;
     // only accept cos_line in the range [-1,1], if it is outside, use 0 (we return 0 rather than PI for those cases)
-    if (cos_line >= -1.0 && cos_line <= 1.0) rad = qAcos( cos_line );
-    return rad * 360 / M_2PI;
+    if (cos_line >= qreal(-1.0) && cos_line <= qreal(1.0)) rad = qAcos( cos_line );
+    return q_rad2deg(rad);
 }