diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-22 16:43:27 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-26 16:02:55 +0000 |
| commit | 1641456366010d2d470e692b80effc601d97fa03 (patch) | |
| tree | 233554106f2c86d8f697e3292446b067d879d5af /src | |
| parent | 445d29dbb8135944ff3a9283b7622de75d68e747 (diff) | |
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 <simon.hausmann@theqtcompany.com>
(cherry picked from qtscript/c095135d047db6190beafab48d083b00ec82f2d8)
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/WebKit.pri | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h index b1ec09f095..a1c4344bcc 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h +++ b/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) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h index 7ba487fcb3..4dfbff8f20 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h +++ b/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. diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 9aaaa996d8..30c8726ccc 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/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 |