Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (265 commits)
  Partial update window surfaces always need a repaint before flush.
  Fix for misplaced endif in qglobal.h.
  Implement language fallback logic for localize_deployment
  Added missing ifdefs to allow compilation on older Symbian versions.
  Multiple screen support for Symbian in QDeskopWidget.
  Adding quote around files in QMAKE_CLEAN to tackle wildcard issue
  Bump Qt version to 4.7.3
  Fix unstable qdeclarativeflickable test.
  Added native image handle provider header.
  Fix possible bearer management Crash with Panic E32USER-CBase, 69
  Added native image handle provider support in pixmaps on openvg.
  Correcting incorrect ordinal introduced by the split view changes.
  Support partial input mode
  Update TextEdit's visible selection when only the anchor changes.
  Fixed memory leak in GL texture cache with QRuntimePixmapData.
  Avoid compiler warnings in openvg on win32.
  Updated def files with new QVGPixmapData function.
  VGImage readback support in QPixmap on OpenVG.
  Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster
  QNetworkCookie: fix quoted values
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index fc480c2..f367c26 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -150,16 +150,15 @@ SymbianEngine::~SymbianEngine()
 
     iConnectionMonitor.CancelNotifications();
     iConnectionMonitor.Close();
-    
-#ifdef SNAP_FUNCTIONALITY_AVAILABLE    
-    iCmManager.Close();
-#endif
-    
-    // CCommsDatabase destructor uses cleanup stack. Since QNetworkConfigurationManager
+
+    // CCommsDatabase destructor and RCmManager.Close() use cleanup stack. Since QNetworkConfigurationManager
     // is a global static, but the time we are here, E32Main() has been exited already and
     // the thread's default cleanup stack has been deleted. Without this line, a
     // 'E32USER-CBase 69' -panic will occur.
     CTrapCleanup* cleanup = CTrapCleanup::New();
+#ifdef SNAP_FUNCTIONALITY_AVAILABLE
+    iCmManager.Close();
+#endif
     delete ipCommsDB;
     delete cleanup;
 }
@@ -829,6 +828,7 @@ void SymbianEngine::updateStatesToSnaps()
                 discovered = true;
             }
         }
+        snapConfigLocker.unlock();
         if (active) {
             changeConfigurationStateTo(ptr, QNetworkConfiguration::Active);
         } else if (discovered) {