the final license header changes

Change-Id: I41fe1a29c480bb45aad9ddfe6e50752d3a822ce4
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

2 files changed, 26 insertions, 20 deletions

diff --git a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp
index 002b33160..f5b8123e7 100644
--- a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.cpp
+++ b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.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,11 +17,16 @@
 ** 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
+**
+** 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 are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
 
diff --git a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.h b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.h
index 8a83eb382..0913ba930 100644
--- a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.h
+++ b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.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 EXTRACTIONARCHIVEOPERATIONTEST_H
 #define EXTRACTIONARCHIVEOPERATIONTEST_H