diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 18:26:03 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 18:26:03 (GMT) |
commit | aea684027cb0c0fa75dd3f3f72b1dc88bdf39c2c (patch) | |
tree | 8b332a299d929dbda9e0229fb1a17a9e92182b86 /src/plugins | |
parent | 84df1620b1b2e648c4980e7186aa1cb060b59729 (diff) | |
parent | c0756297da324069839622217e3cb38c8a745e33 (diff) | |
download | Qt-aea684027cb0c0fa75dd3f3f72b1dc88bdf39c2c.zip Qt-aea684027cb0c0fa75dd3f3f72b1dc88bdf39c2c.tar.gz Qt-aea684027cb0c0fa75dd3f3f72b1dc88bdf39c2c.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix possible bearer management Crash with Panic E32USER-CBase, 69
QNetworkCookie: fix quoted values
Fix for QTBUG-17746. Quotes is retained in cookie value
Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/bearer/symbian/symbianengine.cpp | 12 |
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) { |