diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/3rdparty/libpng/qt_attribution.json | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/3rdparty/libpng/qt_attribution.json')
| -rw-r--r-- | src/3rdparty/libpng/qt_attribution.json | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/libpng/qt_attribution.json b/src/3rdparty/libpng/qt_attribution.json index 23fb903bdd..a0fd149bf4 100644 --- a/src/3rdparty/libpng/qt_attribution.json +++ b/src/3rdparty/libpng/qt_attribution.json @@ -2,15 +2,15 @@ "Id": "libpng", "Name": "LibPNG", "QDocModule": "qtgui", - "QtUsage": "Used in the qpng image plugin. Configure with -system-png or -no-png to avoid.", + "QtUsage": "Used in the qpng image plugin. Configure with -system-libpng or -no-libpng to avoid.", "Description": "libpng is the official PNG reference library.", "Homepage": "http://www.libpng.org/pub/png/libpng.html", - "Version": "1.6.34", - "License": "libpng License", - "LicenseId": "Libpng", + "Version": "1.6.36", + "License": "libpng License and libpng License 2", + "LicenseId": "Libpng AND Libpng2", "LicenseFile": "LICENSE", - "Copyright": "Copyright (c) 1998-2017 Glenn Randers-Pehrson + "Copyright": "Copyright (c) 1998-2018 Glenn Randers-Pehrson Copyright (c) 2000-2017 Simon-Pierre Cadieux Copyright (c) 2000-2017 Eric S. Raymond Copyright (c) 2000-2017 Mans Rullgard |