diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:31:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:31:22 +0200 |
| commit | b421290b67507cfe125db206f378fc1b38eaae4e (patch) | |
| tree | c3545d82d65b3b207e80446013f0499ddf0617f8 /LICENSE.GPLv3 | |
| parent | 614326721259f1424981444ec84b6b9f4d6400ef (diff) | |
| parent | beac0b2e3ea4b292f0473c00bcf68d75360f89ef (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I4be6cbe9e4ac981f46b3c45d271cac5c7fc677cb
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 4e49b122..71c4ad49 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. |