diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-08-26 11:09:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-26 11:09:08 +0200 |
| commit | 0777b65db3589324ab45ea5d08ad68860623e69b (patch) | |
| tree | fe5e03fc4a36397649f6ec6791b3488efec8c1b4 /README.md | |
| parent | 245b6c0dc73087678de941652f8c752bb49995cf (diff) | |
| parent | cd8da8fe5f608d4968b90f19f30b515058605b8c (diff) | |
| download | qt-creator-0777b65db3589324ab45ea5d08ad68860623e69b.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
qbs/modules/qtc/qtc.qbs
src/plugins/android/androidconfigurations.cpp
Change-Id: If8dc2cdf131811e08ca147c6f58dbb3ed3bf7227
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -213,9 +213,14 @@ While the plugin builds without it, it might not be fully functional. Note that the plugin is disabled by default. -## Third-party Components +# Licenses and Attributions -Qt Creator includes the following third-party components, +Qt Creator is available under commercial licenses from The Qt Company, +and under the GNU General Public License version 3, +annotated with The Qt Company GPL Exception 1.0. +See [LICENSE.GPL-EXCEPT](LICENSE.GPL-EXCEPT) for the details. + +Qt Creator furthermore includes the following third-party components, we thank the authors who made this possible: ### YAML Parser yaml-cpp (MIT License) |