diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:55:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:56:11 +0200 |
| commit | 13f4c129c2ba12956a6105bd57f407cc07708ca1 (patch) | |
| tree | e92a180d0e8c96f6de7488bbd2af58e7923c0069 /tests | |
| parent | a4c96742f5166d6354f2ac22233d4679d12ec3ae (diff) | |
| parent | 95b51b007efdec4994f9c0e01b3a9609ffdedf21 (diff) | |
| download | qtscript-13f4c129c2ba12956a6105bd57f407cc07708ca1.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Conflicts:
.qmake.conf
qtscript.pro
Change-Id: If0f8875c8af2afb717ba394fac4e506076f01517
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 |