diff options
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 14 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index a6e1f47d91..83032c4dc3 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -609,7 +609,15 @@ static inline QString ToLocaleTimeString(double t) static double getLocalTZA() { -#ifndef Q_OS_WIN +#ifdef Q_OS_WIN + TIME_ZONE_INFORMATION tzInfo; + GetTimeZoneInformation(&tzInfo); + return -tzInfo.Bias * 60.0 * 1000.0; +#elif defined(Q_OS_NACL_NEWLIB) + // ### tzset hidden behind __STRICT_ANSI__ + qWarning("Not implemented: getLocalTZA()"); + return 0; +#else struct tm t; time_t curr; tzset(); @@ -619,10 +627,6 @@ static double getLocalTZA() gmtime_r(&curr, &t); time_t globl = mktime(&t); return (double(locl) - double(globl)) * 1000.0; -#else - TIME_ZONE_INFORMATION tzInfo; - GetTimeZoneInformation(&tzInfo); - return -tzInfo.Bias * 60.0 * 1000.0; #endif } diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 2560f065cf..284a9ea88a 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -113,7 +113,7 @@ QT_WARNING_DISABLE_MSVC(4172) // MSVC 2015: warning C4172: returning address of quintptr getStackLimit() { quintptr stackLimit; -#if USE(PTHREADS) && !OS(QNX) +#if USE(PTHREADS) && !OS(QNX) && !defined(Q_OS_NACL) # if OS(DARWIN) pthread_t thread_self = pthread_self(); void *stackTop = pthread_get_stackaddr_np(thread_self); |