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

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Documented limitations of add/setLibraryPath(s) on Symbian OS
  Deployed QtMultimedia.dll on Symbian
  Fixed the URL of known issues wiki page in docs
  Fixing benchmark to be runnable on Symbian device
  Fixing test to be runnable on Symbian devices.
  Fixed no-timeout case for QProcess::waitForFinished in Symbian
  Add visibility-inlines-hidden for GCCE on Symbian OS
  Catch by reference rather than by value
  Fixing benchmark for Symbian
  Remove warning about Symbian DEF files when running configure for Windows
  List item margins are too small due to invalid pixel metric value
  Remove left over forward declarations
  Avoided the loss of preedit text when losing focus on Symbian.
  Added support for ifdeffing for manufacturer in generated pkg files
  Shortening and fixing previous fix for QTBUG-6371
  Update default FPU flags on Symbian to be softvfp+vfpv2
  Using RunFast mode for RVCT

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index abf81bd..342e47b 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -317,7 +317,6 @@ Configure::Configure( int& argc, char** argv )
     dictionary[ "OPENSSL" ]         = "auto";
     dictionary[ "DBUS" ]            = "auto";
     dictionary[ "S60" ]             = "yes";
-    dictionary[ "SYMBIAN_DEFFILES" ] = "yes";
 
     dictionary[ "STYLE_WINDOWS" ]   = "yes";
     dictionary[ "STYLE_WINDOWSXP" ] = "auto";
@@ -1475,6 +1474,7 @@ void Configure::applySpecSpecifics()
         dictionary[ "XMLPATTERNS" ]         = "yes";
         dictionary[ "QT_GLIB" ]             = "no";
         dictionary[ "S60" ]                 = "yes";
+        dictionary[ "SYMBIAN_DEFFILES" ]    = "yes";
         // iconv makes makes apps start and run ridiculously slowly in symbian emulator (HW not tested)
         // iconv_open seems to return -1 always, so something is probably missing from the platform.
         dictionary[ "QT_ICONV" ]            = "no";
@@ -1482,7 +1482,7 @@ void Configure::applySpecSpecifics()
         dictionary[ "QT_HOST_PREFIX" ]      = dictionary[ "QT_INSTALL_PREFIX" ];
         dictionary[ "QT_INSTALL_PREFIX" ]   = "";
         dictionary[ "QT_INSTALL_PLUGINS" ]  = "\\resource\\qt\\plugins";
-        dictionary[ "ARM_FPU_TYPE" ]        = "softvfp";
+        dictionary[ "ARM_FPU_TYPE" ]        = "softvfp+vfpv2";
         dictionary[ "SQL_SQLITE" ]          = "yes";
         dictionary[ "SQL_SQLITE_LIB" ]      = "system";