diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-28 15:03:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-28 15:03:37 (GMT) |
| commit | e154fb84b075ad3fda4ac02d620b28cc50e46c09 (patch) | |
| tree | 04dc1689814817dc175b2e5b5cd81705ca8cdd7f /src/corelib | |
| parent | ec6065c51e1821a7364e66d7500c17d2575ea334 (diff) | |
| parent | a3c3949ae693b72a6d5ffddd03fa8afc76c56b99 (diff) | |
| download | Qt-e154fb84b075ad3fda4ac02d620b28cc50e46c09.zip Qt-e154fb84b075ad3fda4ac02d620b28cc50e46c09.tar.gz Qt-e154fb84b075ad3fda4ac02d620b28cc50e46c09.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Default graphics memory quota for Symbian applications
Fix warning about missing qs60keycapture_p.h header in gui
Reimplement MR1271 over coda patch
Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)
Fix bad merge on a couple of xml examples
DEF file freeze
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index a6fee43..d915989 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -4040,8 +4040,11 @@ static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time) RTz tz; User::LeaveIfError(tz.Connect()); CleanupClosePushL(tz); - res.tm_isdst = tz.IsDaylightSavingOnL(*tz.GetTimeZoneIdL(),utcTTime); + CTzId *tzId = tz.GetTimeZoneIdL(); + CleanupStack::PushL(tzId); + res.tm_isdst = tz.IsDaylightSavingOnL(*tzId,utcTTime); User::LeaveIfError(tz.ConvertToLocalTime(utcTTime)); + CleanupStack::PopAndDestroy(tzId); CleanupStack::PopAndDestroy(&tz)); if (KErrNone == err) { TDateTime localDateTime = utcTTime.DateTime(); |