diff options
author | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-08-22 09:27:42 +0300 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-08-24 17:25:19 +0200 |
commit | 1aae3e22e4a6f60ef0bd1f3fc7e59b7829c95935 (patch) | |
tree | bcbceb97d2617bd2730e6e519973901e9220117f /examples/webkitwidgets/browser/toolbarsearch.cpp | |
parent | 9febe924074ba5adf8fcbb61e9d7b7c83b11dc55 (diff) | |
download | qtwebkit-examples-1aae3e22e4a6f60ef0bd1f3fc7e59b7829c95935.tar.gz |
Update license headers and add new licenses
- Added LICENSE.LGPL21, LICENSE.LGPLv3 & LICENSE.GPLv2
Change-Id: If7c5fa43341211def780bcb77f922b54ddfafb45
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'examples/webkitwidgets/browser/toolbarsearch.cpp')
-rw-r--r-- | examples/webkitwidgets/browser/toolbarsearch.cpp | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/examples/webkitwidgets/browser/toolbarsearch.cpp b/examples/webkitwidgets/browser/toolbarsearch.cpp index 84e4d45..7772d3c 100644 --- a/examples/webkitwidgets/browser/toolbarsearch.cpp +++ b/examples/webkitwidgets/browser/toolbarsearch.cpp @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** Commercial License Usage ** 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://qt.digia.com/licensing. For further information +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information ** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL 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. +** 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, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt 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.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. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |