diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-05-19 14:02:42 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-05-23 07:50:37 +0000 |
| commit | 9f89122a286feec7f80279141fcfb8fee0590cb6 (patch) | |
| tree | 06a2b8db07982cf0aefa59b6795e46bd695cad72 /src/navigationhistoryproxymodel.cpp | |
| parent | 7c570ee4297946f3ed70565a630d690070533cbd (diff) | |
Update Copyright header
Only support GPLv3 for now. Also use new copyright template
from qtbase/header.GPL.
Change-Id: I83f98afb37fe1c4261cc59e9b1d38576de2dd8bf
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Diffstat (limited to 'src/navigationhistoryproxymodel.cpp')
| -rw-r--r-- | src/navigationhistoryproxymodel.cpp | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/src/navigationhistoryproxymodel.cpp b/src/navigationhistoryproxymodel.cpp index d574ae5..a124f76 100644 --- a/src/navigationhistoryproxymodel.cpp +++ b/src/navigationhistoryproxymodel.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the QtBrowser project. +** This file is part of the Qt WebBrowser application. ** ** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage @@ -11,25 +11,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 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. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPLv2 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/gpl-2.0.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 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** 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. ** ** $QT_END_LICENSE$ ** |