summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-24 03:00:18 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-24 03:00:18 +0200
commitbb049cdec322c6273fbd4defab15dd1a14bf6b70 (patch)
treeac95ec940f7244c0e714ae43b14b955c87398968
parentd3d8d9810c414175eebccb4652f296cf8f65dae3 (diff)
parenta951c3cf75fe1da3148b12f2aff2853b4d368909 (diff)
downloadqtscript-bb049cdec322c6273fbd4defab15dd1a14bf6b70.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I76185a8b4e55514c54b285b0362ef8609bc0fce5
-rw-r--r--src/3rdparty/javascriptcore/qt_attribution.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/qt_attribution.json b/src/3rdparty/javascriptcore/qt_attribution.json
index d3fcf52..3683fc7 100644
--- a/src/3rdparty/javascriptcore/qt_attribution.json
+++ b/src/3rdparty/javascriptcore/qt_attribution.json
@@ -5,7 +5,8 @@
"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",
+ "Homepage": "https://trac.webkit.org/wiki/JavaScriptCore",
+ "Version": "Snapshot from 2011-01-27",
"License": "GNU Library General Public License v2 or later",
"LicenseId": "LGPL-2.0+",
"LicenseFile": "JavaScriptCore/COPYING.LIB",