diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 08:40:03 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 08:40:03 (GMT) |
| commit | 7f27ebb0383414f15f391151655e5b09952f8ccd (patch) | |
| tree | 8af7b866af6115924a13896013f5b6f5da686de6 /src/corelib/tools/qdatetime.cpp | |
| parent | 3dccb66b3b81627fb70c7eeccdf32b96d8add8b7 (diff) | |
| parent | 78c5825cfb7702350636b7624bf79311dbd0dbd5 (diff) | |
| download | Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.zip Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.tar.gz Qt-7f27ebb0383414f15f391151655e5b09952f8ccd.tar.bz2 | |
Merge remote branch 'mainline/4.8'
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
| -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 085103c..8e4fb32 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(); |