diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-14 18:07:15 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-16 12:37:56 +0100 |
| commit | 3c85058694ee2e41658d17f524fb48f0b187d2fe (patch) | |
| tree | 47c19e0b01d2e3bf8ca25a986ed0242c651dfff5 /src/libs/3rdparty/cplusplus/cppassert.h | |
| parent | d83fb4d63c9fd92e0e6f429cbd56fa244bddc093 (diff) | |
Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/3rdparty/cplusplus/cppassert.h b/src/libs/3rdparty/cplusplus/cppassert.h index 4960902323..add62e3c3e 100644 --- a/src/libs/3rdparty/cplusplus/cppassert.h +++ b/src/libs/3rdparty/cplusplus/cppassert.h @@ -1,7 +1,7 @@ /**************************************************************************** * ** - * ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - * ** Contact: http://www.qt-project.org/legal + * ** Copyright (C) 2015 The Qt Company Ltd. + * ** Contact: http://www.qt.io/licensing * ** * ** This file is part of Qt Creator. * ** @@ -9,8 +9,8 @@ * ** Licensees holding valid commercial Qt licenses may use this file in * ** 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://www.qt.io/licensing. For further information + * ** a written agreement between you and The Qt Company. For licensing terms and + * ** conditions see http://www.qt.io/terms-conditions. For further information * ** use the contact form at http://www.qt.io/contact-us. * ** * ** GNU Lesser General Public License Usage @@ -22,8 +22,8 @@ * ** 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 + * ** In addition, as a special exception, The Qt Company gives you certain additional + * ** rights. These rights are described in The Qt Company LGPL Exception * ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. * ** * ****************************************************************************/ |