summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/lib7z_facade.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2013-01-21 12:52:13 +0100
committerTim Jenssen <tim.jenssen@digia.com>2013-01-23 13:58:27 +0100
commit01cbce9e057a1ca951d99558feaea5b6f7620541 (patch)
treed0fd5fc5bc0b13f923d7a0099dd6e85c04477102 /src/libs/installer/lib7z_facade.cpp
parent590457501a6edbc732a3a6243305b61bf5dbaf08 (diff)
Fix some warnings in our code after Idcfec77.
Change-Id: Ied8ffad416ae058a45fa2d46f8ff304ff5b4a392 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/installer/lib7z_facade.cpp')
-rw-r--r--src/libs/installer/lib7z_facade.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp
index 96e074a60..23e0f2775 100644
--- a/src/libs/installer/lib7z_facade.cpp
+++ b/src/libs/installer/lib7z_facade.cpp
@@ -185,8 +185,13 @@ static bool IsDST(const QDateTime& datetime = QDateTime())
{
const time_t seconds = static_cast< time_t >(datetime.isValid() ? datetime.toTime_t()
: QDateTime::currentDateTime().toTime_t());
- const tm* const t = localtime(&seconds);
- return t->tm_isdst;
+#ifdef Q_OS_WIN
+ struct tm t;
+ localtime_s(&t, &seconds);
+#else
+ const struct tm &t = *localtime(&seconds);
+#endif
+ return t.tm_isdst;
}
static bool getFileTimeFromProperty(IInArchive* archive, int index, int propId, FILETIME *fileTime)