diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-01 09:58:36 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-01 09:58:36 +0100 |
| commit | ecb9fae785b6cfc06d069a2014cade62264395dd (patch) | |
| tree | 39f6e1e49c02c56266898cc69b0a7401967571b5 /README.md | |
| parent | 6b29198874ab66fb18d0b696478ba6ee247699d4 (diff) | |
| parent | 97631cfdb83654d0aced65d84583303dc4bc245b (diff) | |
| download | qt-creator-ecb9fae785b6cfc06d069a2014cade62264395dd.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 23 |
1 files changed, 23 insertions, 0 deletions
@@ -277,6 +277,29 @@ http://llvm.org/docs/GettingStarted.html#git-mirror: Qt Creator includes the following third-party components, we thank the authors who made this possible: +### Clazy + + https://github.com/KDE/clazy + + Copyright (C) 2015-2018 Clazy Team + + Distributed under GNU LIBRARY GENERAL PUBLIC LICENSE Version 2 (LGPL2). + + Integrated with patches from QtCreator/dist/clang/patches, see README.md there. + +### LLVM/Clang + + http://llvm.org/svn/llvm-project/llvm + http://llvm.org/svn/llvm-project/cfe/trunk + http://llvm.org/svn/llvm-project/clang-tools-extra/trunk + + Copyright (C) 2003-2018 LLVM Team + + Distributed under the University of Illinois/NCSA Open Source License (NCSA), + see https://github.com/llvm-mirror/llvm/blob/master/LICENSE.TXT + + With additional patches from QtCreator/dist/clang/patches, see README.md there. + ### Reference implementation for std::experimental::optional https://github.com/akrzemi1/Optional |