diff options
author | Niels Weber <niels.2.weber@nokia.com> | 2012-02-06 09:23:20 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-02-06 09:52:16 +0100 |
commit | a926661919c17037a8a18ce6910f8b12de5b28a7 (patch) | |
tree | 7e528349af3704c994d014fd636307b0ca571eb3 /installerbuilder/common | |
parent | 07009eaa803bbc61e83c1ae8d21027798657e004 (diff) |
fix license headers for installerbuilder part
Change-Id: I9700402de0357d1bc19175c2cae845cbc5a4d7cc
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder/common')
-rw-r--r-- | installerbuilder/common/repositorygen.cpp | 26 | ||||
-rw-r--r-- | installerbuilder/common/repositorygen.h | 21 |
2 files changed, 27 insertions, 20 deletions
diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp index e6e30f4a8..bfee1ddc8 100644 --- a/installerbuilder/common/repositorygen.cpp +++ b/installerbuilder/common/repositorygen.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 "repositorygen.h" #include <common/fileutils.h> diff --git a/installerbuilder/common/repositorygen.h b/installerbuilder/common/repositorygen.h index 6c39f2c62..c097c4caa 100644 --- a/installerbuilder/common/repositorygen.h +++ b/installerbuilder/common/repositorygen.h @@ -1,10 +1,11 @@ /************************************************************************** ** -** This file is part of Installer Framework** +** This file is part of Installer Framework ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).* +** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** Contact: Nokia Corporation qt-info@nokia.com** ** ** GNU Lesser General Public License Usage ** @@ -16,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. ** **************************************************************************/ + #ifndef QINSTALLER_REPOSITORYGEN_H #define QINSTALLER_REPOSITORYGEN_H |