diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:31:24 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:36:13 +0200 |
| commit | a2244c9b7aa11e386c3331cbbc36336fb8fea3b9 (patch) | |
| tree | a77ac99aa38c40e98aa483795e3cb8061f404203 /LICENSE.LGPLv3 | |
| parent | 31fce88b3fcdbb4d4b2b9a889d24e25c3a5c9507 (diff) | |
| parent | 008d20e0ece4c6dac148915b998a0005657d73a1 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/imports/multimedia/qdeclarativeaudio.cpp
Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
Diffstat (limited to 'LICENSE.LGPLv3')
| -rw-r--r-- | LICENSE.LGPLv3 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 8fbb74390..4d67bac0b 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -5,6 +5,8 @@ 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 + Public License, which you can find in the LICENSE.GPLv3 file. ------------------------------------------------------------------------- |