From 6a15a535181b203e20032f73022d734e3e90c129 Mon Sep 17 00:00:00 2001 From: Fabian Bumberger Date: Tue, 22 Apr 2014 17:57:54 +0200 Subject: Fix time zone calculation The result of local time minus global time might be negative. On QNX time_t is defined as unsigned int and thus the subtraction will not produce the expected result. This patch converts the local time and the global time to double before subtracting them. Task-number: QTBUG-35693 Change-Id: Ifa442b242a4aa23c59fa427015346150b89c9343 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4dateobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/jsruntime') diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index fc94862bfd..ceef88455b 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -633,7 +633,7 @@ static double getLocalTZA() time_t locl = mktime(&t); gmtime_r(&curr, &t); time_t globl = mktime(&t); - return double(locl - globl) * 1000.0; + return (double(locl) - double(globl)) * 1000.0; #else TIME_ZONE_INFORMATION tzInfo; GetTimeZoneInformation(&tzInfo); -- cgit v1.2.3