diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-15 14:59:14 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-01-19 16:05:29 +0000 |
| commit | 38cce7eb8351457b27e49588a324389199e481bc (patch) | |
| tree | 51ddf6461ed8da1eed77935459c94afa484fcd12 /share/qtcreator/snippets | |
| parent | 954569387c28e5b305081ef52796055797b5c8d9 (diff) | |
| download | qt-creator-38cce7eb8351457b27e49588a324389199e481bc.tar.gz | |
Update License according to agreement with Free Qt Foundation
* Update all files in share folder
Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'share/qtcreator/snippets')
| -rw-r--r-- | share/qtcreator/snippets/cpp.xml | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/share/qtcreator/snippets/cpp.xml b/share/qtcreator/snippets/cpp.xml index 5fcf4ca681..24a0b837a7 100644 --- a/share/qtcreator/snippets/cpp.xml +++ b/share/qtcreator/snippets/cpp.xml @@ -148,7 +148,7 @@ $$</snippet> @else ** Copyright (C) %{CurrentDate:yyyy} %{Env:QTC_COPYRIGHT_USER} <%{Env:QTC_COPYRIGHT_EMAIL}>. @endif -** Contact: http://www.qt.io/licensing +** Contact: https://www.qt.io/licensing/ ** ** This file is part of %{CurrentProject:Name} ** @@ -156,22 +156,17 @@ $$</snippet> ** 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 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://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 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, 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. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ****************************************************************************/ |