diff options
author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-04-05 20:55:11 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2016-04-07 10:08:13 +0000 |
commit | 9d9408b7e1c1de0a759e817d422f748e81f09987 (patch) | |
tree | 93c477098f9621c0be7a093ca5424831880e4943 /examples/geniviextras/qdlt/loggingcategories.h | |
parent | 8121b815ea4abe8f0b8454557f0bb6cbef6bf939 (diff) | |
download | qtivi-9d9408b7e1c1de0a759e817d422f748e81f09987.tar.gz |
Fix license headers to comply with Qt 5.7 standards.
src -> LGPL3/GPL3/GPL2/Commercial
tests -> GPL-EXCEPT
examples -> BSD
qdoc files -> FDL (or BSD if documenting examples)
pro/pri files -> no copyright header
Also removed the LGPL2.1 option from GeniviExtras, since it doesn't make sense
anymore when linking against a LGPL3 only QtCore library.
Change-Id: I9299cf86cf37c1dfbbe997686b624084f27c9149
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'examples/geniviextras/qdlt/loggingcategories.h')
-rw-r--r-- | examples/geniviextras/qdlt/loggingcategories.h | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/examples/geniviextras/qdlt/loggingcategories.h b/examples/geniviextras/qdlt/loggingcategories.h index 7132ed1..f158656 100644 --- a/examples/geniviextras/qdlt/loggingcategories.h +++ b/examples/geniviextras/qdlt/loggingcategories.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21-PELAGICORE$ +** $QT_BEGIN_LICENSE:BSD-PELAGICORE$ ** Commercial License Usage ** Licensees holding valid commercial Qt IVI licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,25 +13,43 @@ ** a written agreement between you and Pelagicore. For licensing terms ** and conditions, contact us at http://www.pelagicore.com. ** -** 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. -** -** As a special exception, Pelagicore gives you certain additional -** rights. These rights are described in Pelagicore LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Pelagicore AG nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR 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." ** ** $QT_END_LICENSE$ ** -** SPDX-License-Identifier: LGPL-2.1 +** SPDX-License-Identifier: BSD-3-Clause ** ****************************************************************************/ + #ifndef LOGGINGCATEGORIES_H #define LOGGINGCATEGORIES_H |