diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-18 09:37:17 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-18 09:37:27 +0200 |
commit | ea2a8b12fe36203c29f0bd1a85dc41aada905bf3 (patch) | |
tree | 77eb93febef29b34f7b0589366314cc6da34aa1d /tests | |
parent | cd7d2dc5481f7954da7ebec27b86adda2602c5b7 (diff) | |
parent | 13f4c129c2ba12956a6105bd57f407cc07708ca1 (diff) | |
download | qtscript-ea2a8b12fe36203c29f0bd1a85dc41aada905bf3.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Idebaee1835329337ee03e27e9499b951a5cdb907
Diffstat (limited to 'tests')
-rw-r--r-- | tests/benchmarks/script/sunspider/tests/qt_attribution.json | 1 | ||||
-rw-r--r-- | tests/benchmarks/script/v8/tests/qt_attribution.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/benchmarks/script/sunspider/tests/qt_attribution.json b/tests/benchmarks/script/sunspider/tests/qt_attribution.json index 0044eca..c67b09f 100644 --- a/tests/benchmarks/script/sunspider/tests/qt_attribution.json +++ b/tests/benchmarks/script/sunspider/tests/qt_attribution.json @@ -11,6 +11,7 @@ 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", + "License": "BSD 3-clause \"New\" or \"Revised\" License, GNU Lesser General Public License v2.1 only, and MIT License", "LicenseFile": "LICENSE.txt", "Copyright": "Copyright (C) 2004-2007, The Dojo Foundation Copyright (C) 2004 Baron Schwartz <baron at sequent dot org> diff --git a/tests/benchmarks/script/v8/tests/qt_attribution.json b/tests/benchmarks/script/v8/tests/qt_attribution.json index a68d0c7..64f6f0c 100644 --- a/tests/benchmarks/script/v8/tests/qt_attribution.json +++ b/tests/benchmarks/script/v8/tests/qt_attribution.json @@ -8,6 +8,7 @@ "Description": "A collection of pure JavaScript benchmarks that are used to tune V8.", "Homepage": "https://developers.google.com/v8/", "LicenseId": "BSD-3-Clause", + "License": "BSD 3-clause \"New\" or \"Revised\" License", "LicenseFile": "LICENSE.txt", "Copyright": "Copyright 1996 John Maloney and Mario Wolczko Copyright 2003-2005 Tom Wu |