diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-08-05 11:53:21 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-15 03:44:38 +0200 |
commit | 02c28cbc2c7b74ed9189a8534a8111009064cdce (patch) | |
tree | 4aa136882ffc807053a88bf97614a42c4c1ab615 /examples/browser/toolbarsearch.h | |
parent | 882c6a6cb4525a0b6cd56c185b6c16d5aad828df (diff) | |
download | qtwebkit-examples-02c28cbc2c7b74ed9189a8534a8111009064cdce.tar.gz |
Replace outdated license headers.
Change-Id: I4a703684de904e6f01b8a723dcbd024a8d6201d4
Reviewed-on: http://codereview.qt.nokia.com/2649
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'examples/browser/toolbarsearch.h')
-rw-r--r-- | examples/browser/toolbarsearch.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/examples/browser/toolbarsearch.h b/examples/browser/toolbarsearch.h index deb7a6e..ddb7725 100644 --- a/examples/browser/toolbarsearch.h +++ b/examples/browser/toolbarsearch.h @@ -7,29 +7,29 @@ ** This file is part of the demonstration applications of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** 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. +** 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. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** 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. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** |