fix more license headers

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

18 files changed, 238 insertions, 125 deletions

diff --git a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h
index e7d472067..099bad14a 100644
--- a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h
+++ b/installerbuilder/libinstaller/getrepositoriesmetainfojob.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 GETREPOSITORIESMETAINFOJOB_H
 #define GETREPOSITORIESMETAINFOJOB_H
 
diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.h b/installerbuilder/libinstaller/getrepositorymetainfojob.h
index df8cda263..fba8d76ee 100644
--- a/installerbuilder/libinstaller/getrepositorymetainfojob.h
+++ b/installerbuilder/libinstaller/getrepositorymetainfojob.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 GETREPOSITORYMETAINFOJOB_H
 #define GETREPOSITORYMETAINFOJOB_H
 
diff --git a/installerbuilder/libinstaller/globalsettingsoperation.h b/installerbuilder/libinstaller/globalsettingsoperation.h
index 4918fa521..007bbf549 100644
--- a/installerbuilder/libinstaller/globalsettingsoperation.h
+++ b/installerbuilder/libinstaller/globalsettingsoperation.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 GLOBALSETTINGSOPERATION_H
 #define GLOBALSETTINGSOPERATION_H
 
diff --git a/installerbuilder/libinstaller/init.h b/installerbuilder/libinstaller/init.h
index feee4f55d..a846bc2f3 100644
--- a/installerbuilder/libinstaller/init.h
+++ b/installerbuilder/libinstaller/init.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_INIT_H
 #define QINSTALLER_INIT_H
 
diff --git a/installerbuilder/libinstaller/installiconsoperation.h b/installerbuilder/libinstaller/installiconsoperation.h
index 55cb98deb..86874241c 100644
--- a/installerbuilder/libinstaller/installiconsoperation.h
+++ b/installerbuilder/libinstaller/installiconsoperation.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 INSTALLICONSOPERATION_H
 #define INSTALLICONSOPERATION_H
 
diff --git a/installerbuilder/libinstaller/lazyplaintextedit.h b/installerbuilder/libinstaller/lazyplaintextedit.h
index 240624e51..abbaaef5f 100644
--- a/installerbuilder/libinstaller/lazyplaintextedit.h
+++ b/installerbuilder/libinstaller/lazyplaintextedit.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 LAZYPLAINTEXTEDIT_H
 #define LAZYPLAINTEXTEDIT_H
 
diff --git a/installerbuilder/libinstaller/licenseoperation.h b/installerbuilder/libinstaller/licenseoperation.h
index 0fb52db0d..2e9e4b061 100644
--- a/installerbuilder/libinstaller/licenseoperation.h
+++ b/installerbuilder/libinstaller/licenseoperation.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 LICENSEOPERATION_H
 #define LICENSEOPERATION_H
 
diff --git a/installerbuilder/libinstaller/linereplaceoperation.h b/installerbuilder/libinstaller/linereplaceoperation.h
index 385104d90..2eef665c8 100644
--- a/installerbuilder/libinstaller/linereplaceoperation.h
+++ b/installerbuilder/libinstaller/linereplaceoperation.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 LINEREPLACEOPERATION_H
 #define LINEREPLACEOPERATION_H
 
diff --git a/installerbuilder/libinstaller/macrelocateqt.h b/installerbuilder/libinstaller/macrelocateqt.h
index 526e0e262..4119aaceb 100644
--- a/installerbuilder/libinstaller/macrelocateqt.h
+++ b/installerbuilder/libinstaller/macrelocateqt.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 RELOCATOR_H
 #define RELOCATOR_H
 
diff --git a/installerbuilder/libinstaller/macreplaceinstallnamesoperation.h b/installerbuilder/libinstaller/macreplaceinstallnamesoperation.h
index 06f37224d..6fe7b126e 100644
--- a/installerbuilder/libinstaller/macreplaceinstallnamesoperation.h
+++ b/installerbuilder/libinstaller/macreplaceinstallnamesoperation.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 MACREPLACEINSTALLNAMEOPERATION_H
 #define MACREPLACEINSTALLNAMEOPERATION_H
 
diff --git a/installerbuilder/libinstaller/messageboxhandler.h b/installerbuilder/libinstaller/messageboxhandler.h
index 9aa15ec0d..102dd8e61 100644
--- a/installerbuilder/libinstaller/messageboxhandler.h
+++ b/installerbuilder/libinstaller/messageboxhandler.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_MESSAGEBOXHANDLER_H
 #define QINSTALLER_MESSAGEBOXHANDLER_H
 
diff --git a/installerbuilder/libinstaller/minimumprogressoperation.h b/installerbuilder/libinstaller/minimumprogressoperation.h
index e3dbe9218..9eb6b06e5 100644
--- a/installerbuilder/libinstaller/minimumprogressoperation.h
+++ b/installerbuilder/libinstaller/minimumprogressoperation.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 MINIMUMPROGRESSOPERATION_H
 #define MINIMUMPROGRESSOPERATION_H
 
diff --git a/installerbuilder/libinstaller/operationrunner.h b/installerbuilder/libinstaller/operationrunner.h
index 6fb8099c7..fd660372c 100644
--- a/installerbuilder/libinstaller/operationrunner.h
+++ b/installerbuilder/libinstaller/operationrunner.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 OPERATIONRUNNER_H
 #define OPERATIONRUNNER_H
 
diff --git a/installerbuilder/libinstaller/packagemanagercore.h b/installerbuilder/libinstaller/packagemanagercore.h
index 65c7d9ebc..93db0ed38 100644
--- a/installerbuilder/libinstaller/packagemanagercore.h
+++ b/installerbuilder/libinstaller/packagemanagercore.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 PACKAGEMANAGERCORE_H
 #define PACKAGEMANAGERCORE_H
 
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h
index 9502cbddf..c3a902cf3 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.h
+++ b/installerbuilder/libinstaller/packagemanagercore_p.h
@@ -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.
 **
 **************************************************************************/
+
 #ifndef PACKAGEMANAGERCORE_P_H
 #define PACKAGEMANAGERCORE_P_H
 
diff --git a/installerbuilder/libinstaller/packagemanagergui.h b/installerbuilder/libinstaller/packagemanagergui.h
index 10a800334..a8b9fba9f 100644
--- a/installerbuilder/libinstaller/packagemanagergui.h
+++ b/installerbuilder/libinstaller/packagemanagergui.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 PACKAGEMANAGERGUI_H
 #define PACKAGEMANAGERGUI_H
 
diff --git a/installerbuilder/libinstaller/packagemanagerproxyfactory.h b/installerbuilder/libinstaller/packagemanagerproxyfactory.h
index 7085c9c09..772d21caf 100644
--- a/installerbuilder/libinstaller/packagemanagerproxyfactory.h
+++ b/installerbuilder/libinstaller/packagemanagerproxyfactory.h
@@ -29,6 +29,7 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+
 #ifndef PACKAGEMANAGERPROXYFACTORY_H
 #define PACKAGEMANAGERPROXYFACTORY_H
 
diff --git a/installerbuilder/libinstaller/performinstallationform.h b/installerbuilder/libinstaller/performinstallationform.h
index 9c5a2a39c..27caeff14 100644
--- a/installerbuilder/libinstaller/performinstallationform.h
+++ b/installerbuilder/libinstaller/performinstallationform.h
@@ -1,10 +1,11 @@
 /**************************************************************************
 **
-** This file is part of Nokia Qt SDK**
+** 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 PERFORMINSTALLATIONFORM_H
 #define PERFORMINSTALLATIONFORM_H