summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-26 19:20:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-26 19:20:47 (GMT)
commitef4c65fc364a0262389c0497092a0fa5e1f7d4c3 (patch)
tree751e2fc44b4fb25946d8358d3d3651213305a29a /src
parent73979fe4e47a873e2075e60e58c6b54ee6992c38 (diff)
parent26103b69df9bdd32016f3fbab975a26c8a147ea0 (diff)
downloadQt-ef4c65fc364a0262389c0497092a0fa5e1f7d4c3.zip
Qt-ef4c65fc364a0262389c0497092a0fa5e1f7d4c3.tar.gz
Qt-ef4c65fc364a0262389c0497092a0fa5e1f7d4c3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for DEPLOYMENT.pkg_build_version fix for memory leak in QSysInfo::s60Version()
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qglobal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index af35316..401af85 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1828,6 +1828,7 @@ QSysInfo::S60Version QSysInfo::s60Version()
CDir* contents;
TInt err = fileFinder.FindWildByDir(qt_S60Filter, qt_S60SystemInstallDir, contents);
if (err == KErrNone) {
+ QScopedPointer<CDir> contentsDeleter(contents);
err = contents->Sort(EDescending|ESortByName);
if (err == KErrNone && contents->Count() > 0 && (*contents)[0].iName.Length() >= 12) {
TInt major = (*contents)[0].iName[9] - '0';
@@ -1850,7 +1851,6 @@ QSysInfo::S60Version QSysInfo::s60Version()
}
}
}
- delete contents;
}
# ifdef Q_CC_NOKIAX86