QtScript: Fix build with MSVC2015.

- Remove os-win32 from the include path since the system headers
  are now sufficient.
- Introduce some #if depending on version for traits and snprintf().

Change-Id: I290b2260e3c1595a7940c76ec2d9a4372709b156
Reviewed-by: Simon Hausmann <[email protected]>
(cherry picked from qtscript/c095135d047db6190beafab48d083b00ec82f2d8)

Author: Friedemann Kleint

src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h

@@ -36,6 +36,7 @@
 #if COMPILER(MSVC)
 // FIXME: why a COMPILER check instead of OS? also, these should be HAVE checks
 
+#  if _MSC_VER < 1900
 inline int snprintf(char* buffer, size_t count, const char* format, ...) 
 {
     int result;
@@ -45,6 +46,7 @@ inline int snprintf(char* buffer, size_t count, const char* format, ...)
     va_end(args);
     return result;
 }
+#  endif // _MSC_VER < 1900
 
 #if COMPILER(MSVC7) || OS(WINCE)
 

src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h

@@ -166,7 +166,7 @@ namespace WTF {
         typedef T Type;
     };
 
-#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
+#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600 && _MSC_VER < 1900))
 
     // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.
     // VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.

src/3rdparty/javascriptcore/WebKit.pri

@@ -22,7 +22,7 @@ isEmpty(OUTPUT_DIR) {
 
 DEFINES += BUILDING_QT__=1
 building-libs {
-    win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
+    win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
 } else {
     CONFIG(QTDIR_build) {
         QT += webkit