diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 12:35:17 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 12:35:17 +0200 |
| commit | b8845794b95376e8be39dbdafca2c85b5ec4c195 (patch) | |
| tree | 26fa9590cc3efdfc1570e84c84182ab5545633ef /LICENSE.GPLv3 | |
| parent | 6e1dde1568d5b0dd774173e3d8f63a15c9a10e15 (diff) | |
| parent | 9dc78a2d847bca5ec7b1445356523383a030d7ce (diff) | |
| download | qtscript-b8845794b95376e8be39dbdafca2c85b5ec4c195.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
One side narrowed a QNX define to Dinkum; the other wanted the same
kludges applied for Intel. Combine their changes to the condition.
Change-Id: Id44102e53a0f96b7318437fb47fa76d8bc1119f3
Diffstat (limited to 'LICENSE.GPLv3')
| -rw-r--r-- | LICENSE.GPLv3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index 4e49b12..71c4ad4 100644 --- a/LICENSE.GPLv3 +++ b/LICENSE.GPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3. That license references the General Public License version 3, that is displayed below. Other portions of the Qt Toolkit may be licensed directly under this license. |