From: Simon Hausmann <simon.hausmann@digia.com>
Date: Thu, 7 Feb 2013 15:23:46 +0000 (+0100)
Subject: Fix build of time related code on Windows
X-Git-Tag: upstream/5.2.1~669^2~659^2~298
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be59020ff931d60cdf18bc32c3dc7bc498510d7b;p=platform%2Fupstream%2Fqtdeclarative.git

Fix build of time related code on Windows

Use Q_OS_WIN instead of the non-existent Q_WS_WIN

Change-Id: Ia64908dfdb234bce5f0a2256bb292d91da2fcb68
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---

diff --git a/src/v4/qv4dateobject.cpp b/src/v4/qv4dateobject.cpp
index 737a583..c808c78 100644
--- a/src/v4/qv4dateobject.cpp
+++ b/src/v4/qv4dateobject.cpp
@@ -61,7 +61,7 @@
 #include <qv4codegen_p.h>
 #include <qv4isel_masm_p.h>
 
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
 #  include <time.h>
 #  ifndef Q_OS_VXWORKS
 #    include <sys/time.h>
@@ -294,7 +294,7 @@ static inline double MakeDate(double day, double time)
 
 static inline double DaylightSavingTA(double t)
 {
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
     long int tt = (long int)(t / msPerSecond);
     struct tm tmtm;
     if (!localtime_r((const time_t*)&tt, &tmtm))
@@ -319,7 +319,7 @@ static inline double UTC(double t)
 
 static inline double currentTime()
 {
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
     struct timeval tv;
 
     gettimeofday(&tv, 0);
@@ -640,7 +640,7 @@ static inline QString ToLocaleTimeString(double t)
 
 static double getLocalTZA()
 {
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
     struct tm t;
     time_t curr;
     time(&curr);
diff --git a/src/v4/qv4errorobject.cpp b/src/v4/qv4errorobject.cpp
index fd03f1f..f381a78 100644
--- a/src/v4/qv4errorobject.cpp
+++ b/src/v4/qv4errorobject.cpp
@@ -60,7 +60,7 @@
 #include <qv4codegen_p.h>
 #include <qv4isel_masm_p.h>
 
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
 #  include <time.h>
 #  ifndef Q_OS_VXWORKS
 #    include <sys/time.h>
diff --git a/src/v4/qv4objectproto.cpp b/src/v4/qv4objectproto.cpp
index 6b7bebc..09ffb6a 100644
--- a/src/v4/qv4objectproto.cpp
+++ b/src/v4/qv4objectproto.cpp
@@ -57,7 +57,7 @@
 #include <qv4codegen_p.h>
 #include <qv4isel_masm_p.h>
 
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
 #  include <time.h>
 #  ifndef Q_OS_VXWORKS
 #    include <sys/time.h>
diff --git a/src/v4/qv4stringobject.cpp b/src/v4/qv4stringobject.cpp
index 87506ec..a070cc0 100644
--- a/src/v4/qv4stringobject.cpp
+++ b/src/v4/qv4stringobject.cpp
@@ -62,7 +62,7 @@
 #include <qv4codegen_p.h>
 #include <qv4isel_masm_p.h>
 
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
 #  include <time.h>
 #  ifndef Q_OS_VXWORKS
 #    include <sys/time.h>