Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Remove test cases which cause stack overflow
  Fix compile errors
  Run autotests with minimal capabilities
  Documentation updates for Qt/Symbian on Linux development
  Allow EPOCROOT env var to be without trailing slash.
  Workaround for Symbian Open C bug in socket connect.
  Fix fetchedRoot test variable to work also in Symbian
  Add configure time checks for symbian environment
  Check for existance of sis file parameter to runonphone
  Fix thread synchronization issues in Symbian QFileSystemWatcher
  Disable compiling of the plugin when extra package not found
  Added missing UID3 for qsymbianbearer.dll.
  Enabled previously disabled Qt features.
  Fix includes so it compiles
  Use lowercase includes so it compiles in Linux too
  Fixed library dependency for Gnupoc.
  Removed the --export_all_vtbl from linking.
  Cleaned up the elf2e32 options a bit.

12 files changed, 63 insertions, 65 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
index 69daae7..6136742 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian.cpp
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -106,7 +106,7 @@ void QNotifyChangeEvent::DoCancel()
 }
 
 QSymbianFileSystemWatcherEngine::QSymbianFileSystemWatcherEngine() :
-        errorCode(KErrNone), watcherStarted(false)
+        watcherStarted(false)
 {
     moveToThread(this);
 }
@@ -122,11 +122,7 @@ QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
     QMutexLocker locker(&mutex);
     QStringList p = paths;
 
-    if (!startWatcher()) {
-        qWarning("Could not start QSymbianFileSystemWatcherEngine thread");
-
-        return p;
-    }
+    startWatcher();
 
     QMutableListIterator<QString> it(p);
     while (it.hasNext()) {
@@ -150,18 +146,17 @@ QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
             filePath += QChar(L'/');
         }
 
-        currentEvent = NULL;
+        currentAddEvent = NULL;
         QMetaObject::invokeMethod(this,
                                   "addNativeListener",
                                   Qt::QueuedConnection,
                                   Q_ARG(QString, filePath));
 
         syncCondition.wait(&mutex);
+        if (currentAddEvent) {
+            currentAddEvent->isDir = isDir;
 
-        if (currentEvent) {
-            currentEvent->isDir = isDir;
-
-            activeObjectToPath.insert(currentEvent, path);
+            activeObjectToPath.insert(currentAddEvent, path);
             it.remove();
 
             if (isDir)
@@ -185,10 +180,10 @@ QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &path
     while (it.hasNext()) {
         QString path = it.next();
 
-        currentEvent = activeObjectToPath.key(path);
-        if (!currentEvent)
+        currentRemoveEvent = activeObjectToPath.key(path);
+        if (!currentRemoveEvent)
             continue;
-        activeObjectToPath.remove(currentEvent);
+        activeObjectToPath.remove(currentRemoveEvent);
 
         QMetaObject::invokeMethod(this,
                                   "removeNativeListener",
@@ -202,9 +197,6 @@ QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &path
         directories->removeAll(path);
     }
 
-    if (activeObjectToPath.size() == 0)
-        stop();
-
     return p;
 }
 
@@ -228,44 +220,31 @@ void QSymbianFileSystemWatcherEngine::stop()
 }
 
 // This method must be called inside mutex
-bool QSymbianFileSystemWatcherEngine::startWatcher()
+void QSymbianFileSystemWatcherEngine::startWatcher()
 {
-    bool retval = true;
-
     if (!watcherStarted) {
         setStackSize(0x5000);
         start();
         syncCondition.wait(&mutex);
-
-        if (errorCode != KErrNone) {
-            retval = false;
-        } else {
-            watcherStarted = true;
-        }
+        watcherStarted = true;
     }
-    return retval;
 }
 
 
 void QSymbianFileSystemWatcherEngine::run()
 {
-    // Initialize file session
-
     mutex.lock();
     syncCondition.wakeOne();
     mutex.unlock();
 
-    if (errorCode == KErrNone) {
-        exec();
+    exec();
 
-        foreach(QNotifyChangeEvent *e, activeObjectToPath.keys()) {
-            e->Cancel();
-            delete e;
-        }
-
-        activeObjectToPath.clear();
-        watcherStarted = false;
+    foreach(QNotifyChangeEvent *e, activeObjectToPath.keys()) {
+        e->Cancel();
+        delete e;
     }
+
+    activeObjectToPath.clear();
 }
 
 void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directoryPath)
@@ -273,16 +252,16 @@ void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directory
     QMutexLocker locker(&mutex);
     QString nativeDir(QDir::toNativeSeparators(directoryPath));
     TPtrC ptr(qt_QString2TPtrC(nativeDir));
-    currentEvent = new QNotifyChangeEvent(qt_s60GetRFs(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
+    currentAddEvent = new QNotifyChangeEvent(qt_s60GetRFs(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
     syncCondition.wakeOne();
 }
 
 void QSymbianFileSystemWatcherEngine::removeNativeListener()
 {
     QMutexLocker locker(&mutex);
-    currentEvent->Cancel();
-    delete currentEvent;
-    currentEvent = NULL;
+    currentRemoveEvent->Cancel();
+    delete currentRemoveEvent;
+    currentRemoveEvent = NULL;
     syncCondition.wakeOne();
 }
 
diff --git a/src/corelib/io/qfilesystemwatcher_symbian_p.h b/src/corelib/io/qfilesystemwatcher_symbian_p.h
index 7e3f045..e687a4a 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian_p.h
+++ b/src/corelib/io/qfilesystemwatcher_symbian_p.h
@@ -113,14 +113,14 @@ private:
     friend class QNotifyChangeEvent;
     void emitPathChanged(QNotifyChangeEvent *e);
 
-    bool startWatcher();
+    void startWatcher();
 
     QHash<QNotifyChangeEvent*, QString> activeObjectToPath;
     QMutex mutex;
     QWaitCondition syncCondition;
-    int errorCode;
     bool watcherStarted;
-    QNotifyChangeEvent *currentEvent;
+    QNotifyChangeEvent *currentAddEvent;
+    QNotifyChangeEvent *currentRemoveEvent;
 };
 
 #endif // QT_NO_FILESYSTEMWATCHER
diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp
index 3b279ae..af0506f 100644
--- a/src/gui/dialogs/qfileinfogatherer.cpp
+++ b/src/gui/dialogs/qfileinfogatherer.cpp
@@ -55,7 +55,18 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_FILESYSTEMMODEL
 
-bool QFileInfoGatherer::fetchedRoot = false;
+#ifdef QT_BUILD_INTERNAL
+static bool fetchedRoot = false;
+Q_AUTOTEST_EXPORT void qt_test_resetFetchedRoot()
+{
+    fetchedRoot = false;
+}
+
+Q_AUTOTEST_EXPORT bool qt_test_isFetchedRoot()
+{
+    return fetchedRoot;
+}
+#endif
 
 /*!
     Creates thread
@@ -278,7 +289,7 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
 
     // List drives
     if (path.isEmpty()) {
-#if defined Q_AUTOTEST_EXPORT
+#ifdef QT_BUILD_INTERNAL
         fetchedRoot = true;
 #endif
         QFileInfoList infoList;
diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h
index 5abcd94..8681eb5 100644
--- a/src/gui/dialogs/qfileinfogatherer_p.h
+++ b/src/gui/dialogs/qfileinfogatherer_p.h
@@ -195,9 +195,6 @@ private:
     uint userId;
     uint groupId;
 #endif
-public :
-    //for testing purpose
-    static bool fetchedRoot;
 };
 #endif // QT_NO_FILESYSTEMMODEL
 
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 55aa6b0..46de9ef 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -50,17 +50,17 @@
 #include "qapplication.h"
 
 #include <w32std.h>
-#include <AknsConstants.h>
+#include <aknsconstants.h>
 #include <aknconsts.h>
-#include <AknsItemID.h>
-#include <AknsUtils.h>
-#include <AknsDrawUtils.h>
-#include <AknsSkinInstance.h>
-#include <AknsBasicBackgroundControlContext.h>
+#include <aknsitemid.h>
+#include <aknsutils.h>
+#include <aknsdrawutils.h>
+#include <aknsskininstance.h>
+#include <aknsbasicbackgroundcontrolcontext.h>
 #include <avkon.mbg>
 #include <aknfontaccess.h>
 #include <aknlayoutfont.h>
-#include <AknUtils.h>
+#include <aknutils.h>
 #include <aknnavi.h>
 #include <gulicon.h>
 #include <aknbitmapanimation.h>
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index 5084442..f920032 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -170,7 +170,12 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) {
     SOURCES += styles/qs60style.cpp
     symbian {
         SOURCES += styles/qs60style_s60.cpp
-        LIBS += -lAknIcon -lAKNSKINS -lAKNSKINSRV -lFontUtils -legul -lbmpanim
+        LIBS += -legul -lbmpanim
+        contains(CONFIG, is_using_gnupoc) {
+            LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
+        } else {
+            LIBS += -lAknIcon -lAKNSKINS -lAKNSKINSRV -lFontUtils
+        }
     } else {
         SOURCES += styles/qs60style_simulated.cpp
         RESOURCES += styles/qstyle_s60_simulated.qrc
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index d155357..70bb0da 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -425,6 +425,9 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16
         case EBADF:
         case EFAULT:
         case ENOTSOCK:
+#ifdef Q_OS_SYMBIAN
+        case EPIPE:
+#endif
             socketState = QAbstractSocket::UnconnectedState;
         default:
             break;
diff --git a/src/plugins/bearer/symbian/symbian.pro b/src/plugins/bearer/symbian/symbian.pro
index f915570..4f1e51c 100644
--- a/src/plugins/bearer/symbian/symbian.pro
+++ b/src/plugins/bearer/symbian/symbian.pro
@@ -11,6 +11,7 @@ SOURCES += symbianengine.cpp \
            main.cpp
 
 symbian {
+    TARGET.UID3=0x20021319
     exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
     exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
         message("Building with SNAP support")
diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro
index 27f05bc..0f0b021 100644
--- a/src/plugins/mediaservices/mediaservices.pro
+++ b/src/plugins/mediaservices/mediaservices.pro
@@ -9,5 +9,7 @@ contains(QT_CONFIG, media-backend) {
         SUBDIRS += gstreamer
     }
 
-    symbian:SUBDIRS += symbian
+    symbian:contains(QT_CONFIG, audio-routing-available) {
+        SUBDIRS += symbian
+    }
 }
diff --git a/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h b/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
index d7259b9..f25b722 100644
--- a/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
+++ b/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
@@ -49,7 +49,7 @@ typedef CMdaAudioPlayerUtility CAudioPlayer;
 typedef MMdaAudioPlayerCallback MAudioPlayerObserver;
 
 #ifndef HAS_NO_AUDIOROUTING
-#include <AudioOutput.h>
+#include <phonon/audiooutput.h>
 #include <MAudioOutputObserver.h>
 #endif
 
diff --git a/src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h b/src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h
index 52e311a..9aece61 100644
--- a/src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h
+++ b/src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h
@@ -48,8 +48,7 @@
 #include <QtGui/qwidget.h>
 #include <qvideowidget.h>
 
-#include <AudioOutput.h>
-#include <MAudioOutputObserver.h>
+#include <phonon/audiooutput.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index dfd2694..97b2232 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -158,11 +158,12 @@ symbian: {
     contains(QT_CONFIG, media-backend) {
         qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMediaServices$${QT_LIBINFIX}.dll
 
-        mediaservices_plugins.path = c:$$QT_PLUGINS_BASE_DIR/mediaservices
-        mediaservices_plugins.sources += $$QT_BUILD_TREE/plugins/mediaservices/qmmfengine$${QT_LIBINFIX}.dll
+        contains(QT_CONFIG, audio-routing-available) {
+            mediaservices_plugins.path = c:$$QT_PLUGINS_BASE_DIR/mediaservices
+            mediaservices_plugins.sources += $$QT_BUILD_TREE/plugins/mediaservices/qmmfengine$${QT_LIBINFIX}.dll
+        }
 
         DEPLOYMENT += mediaservices_plugins
-
     }
 
     BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"