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.GPLv3 | |
| 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.GPLv3')
| -rw-r--r-- | LICENSE.GPLv3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index afa69d94b9..4e49b122ae 100644 --- a/LICENSE.GPLv3 +++ b/LICENSE.GPLv3 @@ -6,7 +6,7 @@ You may use, distribute and copy the Qt GUI 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 other this license. + portions of the Qt Toolkit may be licensed directly under this license. ------------------------------------------------------------------------- |