diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-06-08 16:04:15 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-06-08 16:04:15 +0200 |
| commit | c644e7c80aa752c6154fa36fdc3ce47e0e17e758 (patch) | |
| tree | 7aea6f2d15477c7dc0b0e4aa9e00156920c65b1d /README.md | |
| parent | bfcd1149eb688707a5495ce63f39e93bcf0c0a54 (diff) | |
| parent | 42cad8970819c650c73f5daa4b6ea2f775ff7ad0 (diff) | |
| download | qt-creator-c644e7c80aa752c6154fa36fdc3ce47e0e17e758.tar.gz | |
Merge remote-tracking branch 'origin/qds-1.59'
Conflicts:
src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp
Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -439,6 +439,17 @@ we thank the authors who made this possible: Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) +### Implementation for std::span + + https://github.com/tcbrindle/span + + QtCreator/src/libs/3rdparty/span + + Copyright Tristan Brindle, 2018 + + Distributed under the Boost Software License, Version 1.0. + (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) + ### Open Source front-end for C++ (license MIT), enhanced for use in Qt Creator Roberto Raggi <roberto.raggi@gmail.com> |