diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-26 10:00:10 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 10:00:10 +0100 |
commit | d9d0f0fb7857b71c04f6ff8c30e3092a57af1ef4 (patch) | |
tree | 16b8ac3e1144dd2689c88692d141817a0d41a7fc /src | |
parent | 9cd0730ab10e6fe8244270bec16fe8bbde3dee82 (diff) | |
parent | c35df2ec0ee05351912e768d298a7c627dbdd1ef (diff) | |
download | qtscript-d9d0f0fb7857b71c04f6ff8c30e3092a57af1ef4.tar.gz |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: Ie2fd8a4163d05cf2976e129b4fb35a2d1d023f0a
Diffstat (limited to 'src')
-rw-r--r-- | src/3rdparty/javascriptcore/qt_attribution.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/qt_attribution.json b/src/3rdparty/javascriptcore/qt_attribution.json index a198b92..8aa031d 100644 --- a/src/3rdparty/javascriptcore/qt_attribution.json +++ b/src/3rdparty/javascriptcore/qt_attribution.json @@ -8,7 +8,7 @@ "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", + "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 |