diff options
author | Eike Ziller <eike.ziller@digia.com> | 2014-10-01 13:21:18 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-10-09 11:41:44 +0200 |
commit | 8295b503be90c60a8a7e9b722357352917406078 (patch) | |
tree | 57efd651b9034fefbd2a37fec82bdc36649f8900 /src/libs/3rdparty/cplusplus/cppassert.h | |
parent | 1546afd0e36923f7e52384b664796cffd95a3cc2 (diff) |
License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/cppassert.h')
-rw-r--r-- | src/libs/3rdparty/cplusplus/cppassert.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/libs/3rdparty/cplusplus/cppassert.h b/src/libs/3rdparty/cplusplus/cppassert.h index f63ef0eb7c..4960902323 100644 --- a/src/libs/3rdparty/cplusplus/cppassert.h +++ b/src/libs/3rdparty/cplusplus/cppassert.h @@ -10,16 +10,17 @@ * ** accordance with the commercial license agreement provided with the * ** Software or, alternatively, in accordance with the terms contained in * ** a written agreement between you and Digia. For licensing terms and - * ** conditions see http://qt.digia.com/licensing. For further information - * ** use the contact form at http://qt.digia.com/contact-us. + * ** conditions see http://www.qt.io/licensing. For further information + * ** use the contact form at http://www.qt.io/contact-us. * ** * ** GNU Lesser General Public License Usage * ** Alternatively, this file may be used under the terms of the GNU Lesser - * ** General Public License version 2.1 as published by the Free Software - * ** Foundation and appearing in the file LICENSE.LGPL included in the - * ** packaging of this file. Please review the following information to - * ** ensure the GNU Lesser General Public License version 2.1 requirements - * ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + * ** General Public License version 2.1 or version 3 as published by the Free + * ** Software Foundation and appearing in the file LICENSE.LGPLv21 and + * ** LICENSE.LGPLv3 included in the packaging of this file. Please review the + * ** following information to ensure the GNU Lesser General Public License + * ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. * ** * ** In addition, as a special exception, Digia gives you certain additional * ** rights. These rights are described in the Digia Qt LGPL Exception |