diff options
author | Niels Weber <niels.2.weber@nokia.com> | 2012-02-06 11:00:18 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-02-06 11:03:08 +0100 |
commit | 971f271860768e5a485d2e8883050567fe0f96ca (patch) | |
tree | f4f778e7bea954dae1a699160e6439698b91405c /tools | |
parent | 96dbcd310f23dbf755b486349e5ed49ca7b5c87a (diff) |
the final license header changes
Change-Id: I41fe1a29c480bb45aad9ddfe6e50752d3a822ce4
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/extractbinarydata/main.cpp | 26 | ||||
-rw-r--r-- | tools/fileengineclient/fileengineclient.cpp | 26 | ||||
-rw-r--r-- | tools/fileengineserver/fileengineserver.cpp | 26 |
3 files changed, 39 insertions, 39 deletions
diff --git a/tools/extractbinarydata/main.cpp b/tools/extractbinarydata/main.cpp index f8b8dcf1b..9f478bfe1 100644 --- a/tools/extractbinarydata/main.cpp +++ b/tools/extractbinarydata/main.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** 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 ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** If you have questions regarding the use of this file, please contact +** Nokia at info@qt.nokia.com. ** **************************************************************************/ + #include <common/binaryformat.h> #include <common/errors.h> #include <common/fileutils.h> diff --git a/tools/fileengineclient/fileengineclient.cpp b/tools/fileengineclient/fileengineclient.cpp index d8828dce4..f4029c425 100644 --- a/tools/fileengineclient/fileengineclient.cpp +++ b/tools/fileengineclient/fileengineclient.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** 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 ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** If you have questions regarding the use of this file, please contact +** Nokia at info@qt.nokia.com. ** **************************************************************************/ + #include <fsengineclient.h> #include <QProcess> diff --git a/tools/fileengineserver/fileengineserver.cpp b/tools/fileengineserver/fileengineserver.cpp index a01b9c95a..f8e6ebfa1 100644 --- a/tools/fileengineserver/fileengineserver.cpp +++ b/tools/fileengineserver/fileengineserver.cpp @@ -1,17 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation qt-info@nokia.com** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** 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 ** @@ -23,13 +17,19 @@ ** 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 version -** 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage ** -** If you are unsure which license is appropriate for your use, please contact -** (qt-info@nokia.com). +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** If you have questions regarding the use of this file, please contact +** Nokia at info@qt.nokia.com. ** **************************************************************************/ + #include <fsengineserver.h> #include <QApplication> |