Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I593c05d4dd860dd24ef13d446c700a65d96496f3

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/benchmarks/script/sunspider/tests/qt_attribution.json b/tests/benchmarks/script/sunspider/tests/qt_attribution.json
new file mode 100644
index 0000000..0044eca
--- /dev/null
+++ b/tests/benchmarks/script/sunspider/tests/qt_attribution.json
@@ -0,0 +1,32 @@
+{
+    "Id": "benchmarks-sunspider",
+    "Name": "SunSpider benchmark tests",
+    "QDocModule": "qtscript",
+    "QtUsage": "Used in the benchmarking tests for Qt Script.",
+    "QtParts": [ "tests" ],
+
+    "Description": "SunSpider is a JavaScript benchmark. This benchmark tests the core JavaScript
+language only, not the DOM or other browser APIs. It is designed to compare different versions of
+the same browser, and different browsers to each other.",
+    "Homepage": "https://webkit.org/perf/sunspider/sunspider.html",
+    "Version": "0.9.1",
+    "LicenseId": "BSD-3-Clause AND LGPL-2.1 AND MIT",
+    "LicenseFile": "LICENSE.txt",
+    "Copyright": "Copyright (C) 2004-2007, The Dojo Foundation
+Copyright (C) 2004 Baron Schwartz <baron at sequent dot org>
+Copyright (C) 2007 Apple Inc
+Copyright (C) Rich Moore
+Copyright (C) 2007 John Resig (jquery.com)
+Copyright (C) Paul Johnston 1999 - 2002
+Copyright (C) Geg Holt
+Copyright (C) Andrew Kepert
+Copyright (C) Ydnar
+Copyright (C) Lostinet
+Copyright (C) 2004 by Arthur Langereis (arthur_ext at domain xfinitegames, tld com)
+Copyright (C) 2000 Martijn Pieters <mj@digicool.com>
+Copyright (C) Samuel Sieb <samuel@sieb.net>
+Copyright (C)  Jesse Millikan
+Copyright (C) Isaac Gouy
+Copyright (C) Ian Osgood
+Copyright (C) Simon Speich"
+}