diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-08-26 23:34:59 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-08-26 23:34:59 (GMT) |
commit | be9968c0ee3943c7cc169b4ad8e36155b06bf620 (patch) | |
tree | fd39afb623d7a787a42f71f148ebd051fdd51a14 /src/corelib/global/qglobal.cpp | |
parent | d477cc1498ccf2204dd0e5cd6676f5c0788a9090 (diff) | |
parent | ef4c65fc364a0262389c0497092a0fa5e1f7d4c3 (diff) | |
download | Qt-be9968c0ee3943c7cc169b4ad8e36155b06bf620.zip Qt-be9968c0ee3943c7cc169b4ad8e36155b06bf620.tar.gz Qt-be9968c0ee3943c7cc169b4ad8e36155b06bf620.tar.bz2 |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r-- | src/corelib/global/qglobal.cpp | 2 |
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 |