From 93060d032f958030fb8f853a14385bc3c881e94c Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 25 Aug 2015 07:48:08 +0300 Subject: Fixed bugs in license header Two files were using old LGPL license headers and that's why license header tests were failed. Changed those files to use LGPLv3 header template Change-Id: I95bd010087b83c6aa174d53e7c2378bdd9e57c70 Reviewed-by: Simon Hausmann --- tests/auto/qml/shared/qt_webview_quicktest.h | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/auto/qml/shared/qt_webview_quicktest.h b/tests/auto/qml/shared/qt_webview_quicktest.h index 2881b34..70c881b 100644 --- a/tests/auto/qml/shared/qt_webview_quicktest.h +++ b/tests/auto/qml/shared/qt_webview_quicktest.h @@ -5,7 +5,7 @@ ** ** This file is part of the QtWebView module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -16,24 +16,19 @@ ** ** 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 +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 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. -** -** 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. +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. ** ** $QT_END_LICENSE$ ** -- cgit v1.2.3