From 96dbcd310f23dbf755b486349e5ed49ca7b5c87a Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Mon, 6 Feb 2012 10:49:11 +0100 Subject: more license header fixes Change-Id: I0ad47f49fa770286073ed41ebf0b57abd65d6eb2 Reviewed-by: Tim Jenssen --- installerbuilder/libinstaller/qtpatch.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'installerbuilder/libinstaller/qtpatch.cpp') diff --git a/installerbuilder/libinstaller/qtpatch.cpp b/installerbuilder/libinstaller/qtpatch.cpp index cfcaeabdf..99f669fba 100644 --- a/installerbuilder/libinstaller/qtpatch.cpp +++ b/installerbuilder/libinstaller/qtpatch.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 "qtpatch.h" #include -- cgit v1.2.3