diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 12:35:17 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 12:35:17 +0200 |
| commit | b8845794b95376e8be39dbdafca2c85b5ec4c195 (patch) | |
| tree | 26fa9590cc3efdfc1570e84c84182ab5545633ef /src/3rdparty | |
| parent | 6e1dde1568d5b0dd774173e3d8f63a15c9a10e15 (diff) | |
| parent | 9dc78a2d847bca5ec7b1445356523383a030d7ce (diff) | |
| download | qtscript-b8845794b95376e8be39dbdafca2c85b5ec4c195.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
One side narrowed a QNX define to Dinkum; the other wanted the same
kludges applied for Intel. Combine their changes to the condition.
Change-Id: Id44102e53a0f96b7318437fb47fa76d8bc1119f3
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/WebKit.pri | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp index d5adbd7..1b2fd1d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp @@ -559,7 +559,7 @@ static inline void *currentThreadStackBaseQNX() static pthread_t stackThread; pthread_t thread = pthread_self(); if (stackBase == 0 || thread != stackThread) { - struct _debug_thread_info threadInfo; + debug_thread_t threadInfo; memset(&threadInfo, 0, sizeof(threadInfo)); threadInfo.tid = pthread_self(); int fd = open("/proc/self", O_RDONLY); diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index 094d456..bf3cb53 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -40,7 +40,7 @@ #include <machine/ieee.h> #endif -#if OS(QNX) || COMPILER(INTEL) +#if (OS(QNX) && defined(_CPPLIB_VER)) || 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. @@ -95,7 +95,7 @@ inline bool isinf(double x) { return !finite(x) && !isnand(x); } #endif -#if OS(OPENBSD) +#if OS(OPENBSD) && __cplusplus < 201103L namespace std { diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 932b17a..18898b3 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -20,7 +20,7 @@ isEmpty(OUTPUT_DIR) { DEFINES += BUILDING_QT__=1 building-libs { - win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 + contains(MSVC_VER, "(9|10|11|12)\.0"): INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 } else { CONFIG(QTDIR_build) { QT += webkit |