diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-07-21 06:55:47 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-09-01 19:48:18 +0300 |
| commit | 255935c14af38a3f39c4f23f99eda6901c39998f (patch) | |
| tree | f9638c9167bded5c09cbfc934a8eae225062a7ec | |
| parent | a7f15a82690a7736e2020ebf1d783a1b9a24908c (diff) | |
| download | qtlocation-mapboxgl-255935c14af38a3f39c4f23f99eda6901c39998f.tar.gz | |
[qt] Add zlib to mapbox-gl license
src/mbgl/util/mat* are licensed under zlib.
| -rw-r--r-- | LICENSE_mapbox.txt | 22 | ||||
| -rw-r--r-- | qt_attribution.json | 7 |
2 files changed, 26 insertions, 3 deletions
diff --git a/LICENSE_mapbox.txt b/LICENSE_mapbox.txt index 22031935cd..fa0a43f2f2 100644 --- a/LICENSE_mapbox.txt +++ b/LICENSE_mapbox.txt @@ -22,3 +22,25 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +Copyright (c) 2013 Brandon Jones, Colin MacKenzie IV + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the +use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be + appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. diff --git a/qt_attribution.json b/qt_attribution.json index abdbea165c..802e6938ca 100644 --- a/qt_attribution.json +++ b/qt_attribution.json @@ -7,10 +7,11 @@ "Description": "A library for embedding interactive and customizable vector maps.", "Homepage": "https://github.com/mapbox/mapbox-gl-native", - "LicenseId": "BSD-2-Clause", - "License": "BSD 2-clause \"Simplified\" License", + "LicenseId": "BSD-2-Clause AND Zlib", + "License": "BSD 2-clause \"Simplified\" License and zlib License", "LicenseFile": "LICENSE_mapbox.txt", - "Copyright": "Copyright (c) 2014-2017 Mapbox" + "Copyright": "Copyright (c) 2014-2017 Mapbox +Copyright (c) 2013 Brandon Jones, Colin MacKenzie IV" }, { "Id": "mapboxgl-css_color_parser", |