diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-26 20:06:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-26 20:06:57 +0200 |
| commit | afab1546a7665bac2a8d7a6452e6aea46bfd2127 (patch) | |
| tree | d616a7559c54a40e35a12b464f606774c9b0475b /LICENSE.LGPLv3 | |
| parent | 06b457c693f207e392d3021d77a0ab18cd78da92 (diff) | |
| parent | 53ecaade10319ecc1d8115521ae6d8eba1ee55c1 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
qmake/doc/snippets/code/doc_src_qmake-manual.pro
qmake/doc/src/qmake-manual.qdoc
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/tools/qbytearray.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
tests/auto/network/access/qnetworkreply/BLACKLIST
Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c
Diffstat (limited to 'LICENSE.LGPLv3')
| -rw-r--r-- | LICENSE.LGPLv3 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 2a0988d97b..4d67bac0b4 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -4,8 +4,8 @@ Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of - GNU Lesser General Public License version 3, which is displayed - below. This license makes reference to the version 3 of the GNU General + GNU Lesser General Public License version 3, which is displayed below. + This license makes reference to the version 3 of the GNU General Public License, which you can find in the LICENSE.GPLv3 file. ------------------------------------------------------------------------- |