summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-09 03:31:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-09 03:31:34 (GMT)
commit3d7252234b86cbf791dd1bb747befcaab688877f (patch)
tree33e3c132a96b68c7e7fe946c2cafd4dad9ebe15d /src/network
parent8ff8d45451c1cf7d31750f945fe58067121e92f4 (diff)
parent96960787f7cb6f3937cdf7e3da77988259979008 (diff)
downloadQt-3d7252234b86cbf791dd1bb747befcaab688877f.zip
Qt-3d7252234b86cbf791dd1bb747befcaab688877f.tar.gz
Qt-3d7252234b86cbf791dd1bb747befcaab688877f.tar.bz2
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: Fix resource leak in symbian socket engine Use memmove in QListData::append(int) as regions overlap.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/socket/qsymbiansocketengine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/socket/qsymbiansocketengine.cpp b/src/network/socket/qsymbiansocketengine.cpp
index 0aa5a5a..966af88 100644
--- a/src/network/socket/qsymbiansocketengine.cpp
+++ b/src/network/socket/qsymbiansocketengine.cpp
@@ -264,6 +264,7 @@ QSymbianSocketEnginePrivate::QSymbianSocketEnginePrivate() :
QSymbianSocketEnginePrivate::~QSymbianSocketEnginePrivate()
{
+ selectTimer.Close();
}