diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:26:59 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:27:07 +0200 |
| commit | ab6df191029eeeb0b0f16f127d553265659f739e (patch) | |
| tree | e4b6d03c0af230d665f61cbfebd09769fb498ea5 /Source | |
| parent | 04d8ad739e2b248101aa20aa7135db45999c8810 (diff) | |
| parent | d9ca6bcb08d9560e91a1ca1fe4542c26791b26c1 (diff) | |
| download | qtwebkit-ab6df191029eeeb0b0f16f127d553265659f739e.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I54f845386aa362bb77801ffbac6e06339e839fc8
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/JavaScriptCore/jsc.pro | 2 | ||||
| -rw-r--r-- | Source/WTF/WTF.pri | 2 | ||||
| -rw-r--r-- | Source/WTF/wtf/MathExtras.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro index 91ebcc2a0..4efe024d6 100644 --- a/Source/JavaScriptCore/jsc.pro +++ b/Source/JavaScriptCore/jsc.pro @@ -13,7 +13,7 @@ QT -= gui win32-*: CONFIG += console win32-msvc*: CONFIG += exceptions_off stl_off -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +contains(MSVC_VER, "(9|10|11|12)\.0)"): INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 WEBKIT += javascriptcore wtf diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index b4f7765ac..1f4866d66 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -49,4 +49,4 @@ mac { } # MSVC is lacking stdint.h as well as inttypes.h. -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc|wince*: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +contains(MSVC_VER, "(9|10|11|12)\.0"): INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 diff --git a/Source/WTF/wtf/MathExtras.h b/Source/WTF/wtf/MathExtras.h index 859722386..36c7d0e8c 100644 --- a/Source/WTF/wtf/MathExtras.h +++ b/Source/WTF/wtf/MathExtras.h @@ -43,7 +43,7 @@ #include <machine/ieee.h> #endif -#if OS(QNX) +#if OS(QNX) || COMPILER(INTEL) // FIXME: Look into a way to have cmath import its functions into both the standard and global // namespace. For now, we include math.h since the QNX cmath header only imports its functions // into the standard namespace. @@ -106,7 +106,7 @@ inline bool isinf(double x) { return !finite(x) && !isnand(x); } #endif -#if OS(OPENBSD) +#if OS(OPENBSD) && __cplusplus < 201103L namespace std { |