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

Conflicts:
	.qmake.conf

Change-Id: I6c9ecff3a336c5183aa631e7ce600e99f9594dd5

3 files changed, 55 insertions, 7 deletions

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
index ec27eeb..c763172 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
@@ -67,12 +67,6 @@ mingw:equals(QT_ARCH, x86_64): DEFINES+=ENABLE_YARR_JIT=0
     }
 }
 
-wince* {
-    INCLUDEPATH += $$PWD/../../ce-compat
-    SOURCES += $$PWD/../../ce-compat/ce_time.c
-    DEFINES += WINCEBASIC
-}
-
 include(pcre/pcre.pri)
 
 SOURCES += \
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h
index 156ff1a..83eca64 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h
@@ -618,7 +618,7 @@ namespace WTF {
     QDataStream& operator<<(QDataStream& stream, const Vector<T>& data)
     {
         stream << qint64(data.size());
-        foreach (const T& i, data)
+        for (const T& i : data)
             stream << i;
         return stream;
     }
diff --git a/src/3rdparty/javascriptcore/qt_attribution.json b/src/3rdparty/javascriptcore/qt_attribution.json
new file mode 100644
index 0000000..a198b92
--- /dev/null
+++ b/src/3rdparty/javascriptcore/qt_attribution.json
@@ -0,0 +1,54 @@
+{
+    "Id": "javascriptcore",
+    "Name": "JavaScriptCore",
+    "QDocModule": "qtscript",
+    "Description": "JavaScriptCore is the built-in JavaScript engine, originally developed for WebKit.",
+    "QtUsage": "Used as JavaScript engine in Qt Script.",
+
+    "Version": "This is a snapshot of JavaScriptCore from git://code.qt.io/qt/qtwebkit.git",
+    "License": "GNU Library General Public License v2 or later",
+    "LicenseId": "LGPL-2.0+",
+    "LicenseFile": "JavaScriptCore/COPYING.lib",
+    "Copyright": "Copyright 2006-2008 the V8 project authors.
+Copyright 2009, The Android Open Source Project
+Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+Copyright (C) 1991, 2000, 2001 by Lucent Technologies.
+Copyright (C) 1991 Free Software Foundation, Inc.
+Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+Copyright (C) 1997-2006 University of Cambridge
+Copyright (C) 1998 John E. Bossom
+Copyright (C) 1999-2004 Harri Porten (porten@kde.org)
+Copyright (C) 1999,2005 Pthreads-win32 contributors
+Copyright (C) 2001, 2013 Peter Kelly (pmk@post.com)
+Copyright (c) 2005-3009 Google Inc.
+Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
+Copyright (C) 2006 Bjoern Graf (bjoern.graf@gmail.com)
+Copyright (C) 2006 George Staikos <staikos@kde.org>
+Copyright (C) 2006 Maks Orlovich
+Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+Copyright (C) 2007-2009 Torch Mobile, Inc.
+Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
+Copyright (C) 2007 Eric Seidel <eric@webkit.org>
+Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
+Copyright (C) 2007 Maks Orlovich
+Copyright (C) 2007 Staikos Computing Services Inc.
+Copyright (C) 2008, 2009 Paul Pedriana <ppedriana@ea.com>.
+Copyright (C) 2008-2009 Torch Mobile Inc.
+Copyright (C) 2008 Alp Toker <alp@atoker.com>
+Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>
+Copyright (C) 2008 David Levin <levin@chromium.org>
+Copyright (C) 2008 Dominik Röttsches <dominik.roettsches@access-company.com>
+Copyright (C) 2008 Google Inc.
+Copyright (C) 2008 Jürg Billeter <j@bitron.ch>
+Copyright (C) 2008 Kelvin W Sherlock (ksherlock@gmail.com)
+Copyright (C) 2008 Torch Mobile Inc. (http://www.torchmobile.com/)
+Copyright (C) 2009 Company 100, Inc.
+Copyright (c) 2009 Ian C. Bullard
+Copyright (C) 2009 Jian Li <jianli@chromium.org>
+Copyright (C) 2009 Kevin Ollivier
+Copyright (C) 2009 Patrick Gansterer (paroga@paroga.com)
+Copyright (C) 2009 Torch Mobile, Inc.
+Copyright (C) 2009 University of Szeged
+Copyright (C) 2015 The Qt Company Ltd
+"
+}