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: (190 commits)
  Fixed Symbian applications with DESTDIR set.
  Removed a warning about generated rss files.
  Revert "Temporarily disable problematic dll."
  Fixed "Cannot install protected application" message on Symbian.
  Worked around a crash in the elf2e32 postlinker tool.
  Worked around case differences in Symbian^3 and Gnupoc.
  Enabled compilation of plugins again.
  Fixed a building bug where the DLL entry point was undefined.
  Moved UID2 processing from cpp code to profiles.
  Added rpp and rsg files to ignore filter.
  Moved two profiles to the correct directory.
  Fix build break caused by undefined symbol SetDialogPreference
  Temporarily disable problematic dll.
  Use the same concept for per-lib tweaks as armcc
  Consistently use the * in configure
  Symbian doesn't have large file support currently, just turn it off
  Remove largefile config test
  Make sure that we have all compile flags available always
  Enabled dependencies for .dso and .lib libraries only.
  Switched to using DEF_FILE, which is the official variable.
  ...

7 files changed, 19 insertions, 5 deletions

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h
index 30f51e1..98d4222 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.h
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.h
@@ -58,7 +58,7 @@
 #include <QDateTime>
 
 #include <e32base.h>
-#include <CommDbConnPref.h>
+#include <commdbconnpref.h>
 #include <es_sock.h>
 #include <rconnmon.h>
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
diff --git a/src/plugins/graphicssystems/trace/trace.pro b/src/plugins/graphicssystems/trace/trace.pro
index d548a6c..07472e2 100644
--- a/src/plugins/graphicssystems/trace/trace.pro
+++ b/src/plugins/graphicssystems/trace/trace.pro
@@ -4,6 +4,7 @@ include(../../qpluginbase.pri)
 QT += network
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems
+symbian:TARGET.UID3 = 0x2002130E
 
 SOURCES = main.cpp qgraphicssystem_trace.cpp
 
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 85f618f..3cb64ad 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -58,7 +58,7 @@ contains(QT_CONFIG, system-tiff) {
                           ../../../3rdparty/libtiff/libtiff/tif_wince.c \
 			  ../../../3rdparty/libtiff/libtiff/tif_win32.c
             }
-            symbian*: {
+            symbian: {
                SOURCES += ../../../3rdparty/libtiff/port/lfind.c
             }
 }
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 730fdc5..42fbf9e 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS	*= accessible imageformats sqldrivers iconengines script bearer
+SUBDIRS	*= imageformats sqldrivers iconengines script bearer
 unix:!symbian {
         contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs
 } else {
@@ -9,6 +9,7 @@ unix:!symbian {
 !embedded:SUBDIRS *= graphicssystems
 embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
 !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
+!symbian:SUBDIRS += accessible
 symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon
 contains(QT_CONFIG, multimedia): SUBDIRS *= audio mediaservices
diff --git a/src/plugins/s60/3_2/3_2.pro b/src/plugins/s60/3_2/3_2.pro
index 468197d..7700677 100644
--- a/src/plugins/s60/3_2/3_2.pro
+++ b/src/plugins/s60/3_2/3_2.pro
@@ -10,7 +10,12 @@ contains(S60_VERSION, 3.1) {
     SOURCES += ../src/qlocale_3_2.cpp \
         ../src/qdesktopservices_3_2.cpp \
         ../src/qcoreapplication_3_2.cpp
-    LIBS += -lDirectoryLocalizer -lefsrv
+    contains(CONFIG, is_using_gnupoc) {
+        LIBS += -ldirectorylocalizer
+    } else {
+        LIBS += -lDirectoryLocalizer
+    }
+    LIBS += -lefsrv
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 }
 
diff --git a/src/plugins/s60/5_0/5_0.pro b/src/plugins/s60/5_0/5_0.pro
index 86e3dc9..164dfaa 100644
--- a/src/plugins/s60/5_0/5_0.pro
+++ b/src/plugins/s60/5_0/5_0.pro
@@ -10,7 +10,12 @@ contains(S60_VERSION, 3.1) {
     SOURCES += ../src/qlocale_3_2.cpp \
         ../src/qdesktopservices_3_2.cpp \
         ../src/qcoreapplication_3_2.cpp
-    LIBS += -lDirectoryLocalizer -lefsrv
+    contains(CONFIG, is_using_gnupoc) {
+        LIBS += -ldirectorylocalizer
+    } else {
+        LIBS += -lDirectoryLocalizer
+    }
+    LIBS += -lefsrv
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 }
 
diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri
index c1aa4ef..1a6f4a2 100644
--- a/src/plugins/s60/s60pluginbase.pri
+++ b/src/plugins/s60/s60pluginbase.pri
@@ -4,6 +4,8 @@ include(../qpluginbase.pri)
 
 CONFIG  -= plugin
 
+QTDIR_build:DESTDIR	 = $$QT_BUILD_TREE/plugins/s60
+
 MMP_RULES += NOEXPORTLIBRARY
 
 defBlock = \