Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (163 commits)
  QLocale: Fixed double to currency string conversion on Mac.
  Fix qstringbuilder4 test on mac
  Compile on Mac.
  Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
  Use the qt_static_metacall in QueuedConnection
  Fix crash after merge of the native symbian thread branch.
  Fix bad merge
  Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5
  Removed useless comment
  SSL code: introduce new error value for blacklisted certificates
  Disable DEF files by default for symbian-gcce.
  HTTP caching internals: fix logic for PreferNetwork and PreferCache
  Added a consistency check for number of missing symbols in elf2e32.
  Updated def file after symbol removal.
  QLocalSocket: fix abort on Windows.
  QStringBuilder: add operator += for QString and QByteArray
  Dummy commit to trigger pulse.
  Fix QMetaObject::indexOfSlot
  Fix compilation
  Documentation for the initilize_list constructor
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/configure b/configure
index a54cfdf..28a9a37 100755
--- a/configure
+++ b/configure
@@ -5136,7 +5136,8 @@ if [ "$CFG_QS60STYLE" = "auto" ]; then
 fi
 
 if [ "$CFG_SYMBIAN_DEFFILES" = "auto" ]; then
-    if [ "$XPLATFORM_SYMBIAN" = "yes" ] && [ "$CFG_DEV" = "no" ]; then
+    # elf2e32 crashes when using def files together with gcce.
+    if [ "$XPLATFORM_SYMBIAN" = "yes" ] && [ "$CFG_DEV" = "no" ] && [ "$XPLATFORM" != "symbian-gcce" ]; then
         CFG_SYMBIAN_DEFFILES=yes
     else
         CFG_SYMBIAN_DEFFILES=no