Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: I0a8e242e0c24a67fe60737674dc3a4ecf0936f3a

18 files changed, 8 insertions, 134 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 5d17bc1..1a22398 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,4 @@
 load(qt_build_config)
-CONFIG += qt_example_installs
 android|boot2qt: CONFIG -= headersclean
 
 MODULE_VERSION = 5.8.0
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3
index 4e49b12..71c4ad4 100644
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 6e18461..dfcab5e 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 2.1, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index 4d67bac..6bf924c 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.
diff --git a/examples/script/calculator/calculator.desktop b/examples/script/calculator/calculator.desktop
deleted file mode 100644
index 25c0820..0000000
--- a/examples/script/calculator/calculator.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Qt Script Calculator
-Exec=/opt/usr/bin/calculator
-Icon=calculator
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/script/context2d/context2d.desktop b/examples/script/context2d/context2d.desktop
deleted file mode 100644
index 16f7df2..0000000
--- a/examples/script/context2d/context2d.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Context2D
-Exec=/opt/usr/bin/context2d
-Icon=context2d
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/script/customclass/customclass.desktop b/examples/script/customclass/customclass.desktop
deleted file mode 100644
index 2e3ffa6..0000000
--- a/examples/script/customclass/customclass.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Custom Script Class
-Exec=/opt/usr/bin/customclass
-Icon=customclass
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/script/defaultprototypes/defaultprototypes.desktop b/examples/script/defaultprototypes/defaultprototypes.desktop
deleted file mode 100644
index 6381546..0000000
--- a/examples/script/defaultprototypes/defaultprototypes.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Default Prototypes
-Exec=/opt/usr/bin/defaultprototypes
-Icon=defaultprototypes
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/script/helloscript/helloscript.desktop b/examples/script/helloscript/helloscript.desktop
deleted file mode 100644
index 7dafad9..0000000
--- a/examples/script/helloscript/helloscript.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Hello Script
-Exec=/opt/usr/bin/helloscript
-Icon=helloscript
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/script/marshal/marshal.desktop b/examples/script/marshal/marshal.desktop
deleted file mode 100644
index 8abed70..0000000
--- a/examples/script/marshal/marshal.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Qt Script Marshalling
-Exec=/opt/usr/bin/marshal
-Icon=marshal
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/script/qscript/qscript.desktop b/examples/script/qscript/qscript.desktop
deleted file mode 100644
index d580981..0000000
--- a/examples/script/qscript/qscript.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Qt Script Interpreter
-Exec=/opt/usr/bin/qscript
-Icon=qscript
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/script/qsdbg/qsdbg.desktop b/examples/script/qsdbg/qsdbg.desktop
deleted file mode 100644
index 359b93c..0000000
--- a/examples/script/qsdbg/qsdbg.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Qt Script Debugger
-Exec=/opt/usr/bin/qsdbg
-Icon=qsdbg
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/script/qstetrix/qstetrix.desktop b/examples/script/qstetrix/qstetrix.desktop
deleted file mode 100644
index 4795b13..0000000
--- a/examples/script/qstetrix/qstetrix.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Qt Script Tetrix
-Exec=/opt/usr/bin/qstetrix
-Icon=qstetrix
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
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 46b2241..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)
+#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;