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

5 files changed, 5 insertions, 31 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
diff --git a/src/script/script.pro b/src/script/script.pro
index dec4a4f..03444d2 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -41,27 +41,9 @@ DEFINES += LOG_DISABLED=1
 
 include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri)
 
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/debugger
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/runtime
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wtf
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/unicode
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/interpreter
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/jit
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/profiler
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wrec
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/API
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecode
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/assembler
-INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated
-
 # This line copied from WebCore.pro
 DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1
 
-CONFIG(release, debug|release):DEFINES += NDEBUG
-
 # Avoid JSC C API functions being exported.
 DEFINES += JS_NO_EXPORT
 
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
index e902021..0425f5a 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
@@ -217,14 +217,6 @@ private Q_SLOTS:
         pal.setColor(QPalette::Active, QPalette::Base, col);
         editor->setPalette(pal);
     }
-
-private:
-    static const QWidget *widget(const QStyleOptionViewItem &option)
-    {
-        if (const QStyleOptionViewItemV3 *v3 = qstyleoption_cast<const QStyleOptionViewItemV3 *>(&option))
-            return v3->widget;
-        return 0;
-    }
 };
 
 QScriptDebuggerLocalsItemDelegate::QScriptDebuggerLocalsItemDelegate(
@@ -306,7 +298,7 @@ void QScriptDebuggerLocalsItemDelegate::paint(QPainter *painter, const QStyleOpt
         QStyledItemDelegate::paint(painter, option, index);
     } else {
         // this is a top-level item.
-        const QTreeView *view = qobject_cast<const QTreeView*>(widget(option));
+        const QTreeView *view = qobject_cast<const QTreeView*>(option.widget);
         Q_ASSERT(view != 0);
 
         QStyleOptionButton buttonOption;