summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--installerbuilder/libinstaller/persistentsettings.h31
-rw-r--r--installerbuilder/libinstaller/progresscoordinator.h21
-rw-r--r--installerbuilder/libinstaller/qinstallerglobal.h21
-rw-r--r--installerbuilder/libinstaller/qprocesswrapper.h21
-rw-r--r--installerbuilder/libinstaller/qsettingswrapper.h21
-rw-r--r--installerbuilder/libinstaller/qtcreator_constants.h32
-rw-r--r--installerbuilder/libinstaller/qtcreatorpersistentsettings.h32
-rw-r--r--installerbuilder/libinstaller/qtpatch.h21
-rw-r--r--installerbuilder/libinstaller/qtpatchoperation.h21
-rw-r--r--installerbuilder/libinstaller/registerdefaultdebuggeroperation.h21
-rw-r--r--installerbuilder/libinstaller/registerdocumentationoperation.h21
-rw-r--r--installerbuilder/libinstaller/registerfiletypeoperation.h21
-rw-r--r--installerbuilder/libinstaller/registerqtoperation.h21
-rw-r--r--installerbuilder/libinstaller/registerqtv23operation.h21
-rw-r--r--installerbuilder/libinstaller/registerqtv2operation.h21
-rw-r--r--installerbuilder/libinstaller/registertoolchainoperation.h21
-rw-r--r--installerbuilder/libinstaller/replaceoperation.h21
-rw-r--r--installerbuilder/libinstaller/selfrestartoperation.h21
-rw-r--r--installerbuilder/libinstaller/setdemospathonqtoperation.h21
-rw-r--r--installerbuilder/libinstaller/setexamplespathonqtoperation.h21
-rw-r--r--installerbuilder/libinstaller/setimportspathonqtcoreoperation.h21
21 files changed, 331 insertions, 142 deletions
diff --git a/installerbuilder/libinstaller/persistentsettings.h b/installerbuilder/libinstaller/persistentsettings.h
index 4fccee66e..1181f22d3 100644
--- a/installerbuilder/libinstaller/persistentsettings.h
+++ b/installerbuilder/libinstaller/persistentsettings.h
@@ -1,33 +1,32 @@
/**************************************************************************
**
-** This file is part of Qt Creator
+** This file is part of Installer Framework
**
** 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
**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** 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
+** 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 have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
+** Nokia at info@qt.nokia.com.
**
**************************************************************************/
diff --git a/installerbuilder/libinstaller/progresscoordinator.h b/installerbuilder/libinstaller/progresscoordinator.h
index 72a850efe..ae2818f92 100644
--- a/installerbuilder/libinstaller/progresscoordinator.h
+++ b/installerbuilder/libinstaller/progresscoordinator.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 PROGRESSCOORDNINATOR_H
#define PROGRESSCOORDNINATOR_H
diff --git a/installerbuilder/libinstaller/qinstallerglobal.h b/installerbuilder/libinstaller/qinstallerglobal.h
index d2e62d99e..654418bec 100644
--- a/installerbuilder/libinstaller/qinstallerglobal.h
+++ b/installerbuilder/libinstaller/qinstallerglobal.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_GLOBAL_H
#define QINSTALLER_GLOBAL_H
diff --git a/installerbuilder/libinstaller/qprocesswrapper.h b/installerbuilder/libinstaller/qprocesswrapper.h
index dfd8df116..b2924a12a 100644
--- a/installerbuilder/libinstaller/qprocesswrapper.h
+++ b/installerbuilder/libinstaller/qprocesswrapper.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 QPROCESSWRAPPER_H
#define QPROCESSWRAPPER_H
diff --git a/installerbuilder/libinstaller/qsettingswrapper.h b/installerbuilder/libinstaller/qsettingswrapper.h
index 5f48681b5..d3f08f32a 100644
--- a/installerbuilder/libinstaller/qsettingswrapper.h
+++ b/installerbuilder/libinstaller/qsettingswrapper.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 QSETTINGSWRAPPER_H
#define QSETTINGSWRAPPER_H
diff --git a/installerbuilder/libinstaller/qtcreator_constants.h b/installerbuilder/libinstaller/qtcreator_constants.h
index 4913b0d5b..e9a30b303 100644
--- a/installerbuilder/libinstaller/qtcreator_constants.h
+++ b/installerbuilder/libinstaller/qtcreator_constants.h
@@ -1,3 +1,35 @@
+/**************************************************************************
+**
+** This file is part of Installer Framework
+**
+** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** 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.
+**
+** 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 have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
#ifndef QTCREATOR_CONSTANTS_H
#define QTCREATOR_CONSTANTS_H
diff --git a/installerbuilder/libinstaller/qtcreatorpersistentsettings.h b/installerbuilder/libinstaller/qtcreatorpersistentsettings.h
index 0f8ca7c07..e443651ca 100644
--- a/installerbuilder/libinstaller/qtcreatorpersistentsettings.h
+++ b/installerbuilder/libinstaller/qtcreatorpersistentsettings.h
@@ -1,3 +1,35 @@
+/**************************************************************************
+**
+** This file is part of Installer Framework
+**
+** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** 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.
+**
+** 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 have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
#ifndef QTCREATORPERSISTENTSETTINGS_H
#define QTCREATORPERSISTENTSETTINGS_H
diff --git a/installerbuilder/libinstaller/qtpatch.h b/installerbuilder/libinstaller/qtpatch.h
index 6da3e8a26..63e62d9d0 100644
--- a/installerbuilder/libinstaller/qtpatch.h
+++ b/installerbuilder/libinstaller/qtpatch.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 QTPATCH_H
#define QTPATCH_H
diff --git a/installerbuilder/libinstaller/qtpatchoperation.h b/installerbuilder/libinstaller/qtpatchoperation.h
index 91c852eef..d9d9c3978 100644
--- a/installerbuilder/libinstaller/qtpatchoperation.h
+++ b/installerbuilder/libinstaller/qtpatchoperation.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 QTPATCHOPERATION_H
#define QTPATCHOPERATION_H
diff --git a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.h b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.h
index ef57b0816..e7d7423c6 100644
--- a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.h
+++ b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.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 REGISTERDEFAULTDEBUGGEROPERATION_H
#define REGISTERDEFAULTDEBUGGEROPERATION_H
diff --git a/installerbuilder/libinstaller/registerdocumentationoperation.h b/installerbuilder/libinstaller/registerdocumentationoperation.h
index 9de45441d..092144684 100644
--- a/installerbuilder/libinstaller/registerdocumentationoperation.h
+++ b/installerbuilder/libinstaller/registerdocumentationoperation.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 REGISTERDOCUMENTATIONOPERATION_H
#define REGISTERDOCUMENTATIONOPERATION_H
diff --git a/installerbuilder/libinstaller/registerfiletypeoperation.h b/installerbuilder/libinstaller/registerfiletypeoperation.h
index 96b15ef40..80aacd484 100644
--- a/installerbuilder/libinstaller/registerfiletypeoperation.h
+++ b/installerbuilder/libinstaller/registerfiletypeoperation.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 REGISTERFILETYPEOPERATION_H
#define REGISTERFILETYPEOPERATION_H
diff --git a/installerbuilder/libinstaller/registerqtoperation.h b/installerbuilder/libinstaller/registerqtoperation.h
index 5c714cae7..60f30749c 100644
--- a/installerbuilder/libinstaller/registerqtoperation.h
+++ b/installerbuilder/libinstaller/registerqtoperation.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 REGISTERQTINCREATOROPERATION_H
#define REGISTERQTINCREATOROPERATION_H
diff --git a/installerbuilder/libinstaller/registerqtv23operation.h b/installerbuilder/libinstaller/registerqtv23operation.h
index 00f33ce7c..fdab7cedb 100644
--- a/installerbuilder/libinstaller/registerqtv23operation.h
+++ b/installerbuilder/libinstaller/registerqtv23operation.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) 2011-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 REGISTERQTINCREATORV23OPERATION_H
#define REGISTERQTINCREATORV23OPERATION_H
diff --git a/installerbuilder/libinstaller/registerqtv2operation.h b/installerbuilder/libinstaller/registerqtv2operation.h
index 41a1a4646..532d986b3 100644
--- a/installerbuilder/libinstaller/registerqtv2operation.h
+++ b/installerbuilder/libinstaller/registerqtv2operation.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 REGISTERQTINCREATORV2OPERATION_H
#define REGISTERQTINCREATORV2OPERATION_H
diff --git a/installerbuilder/libinstaller/registertoolchainoperation.h b/installerbuilder/libinstaller/registertoolchainoperation.h
index 440389152..88c12f4c7 100644
--- a/installerbuilder/libinstaller/registertoolchainoperation.h
+++ b/installerbuilder/libinstaller/registertoolchainoperation.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 REGISTERTOOLCHAINOPERATION_H
#define REGISTERTOOLCHAINOPERATION_H
diff --git a/installerbuilder/libinstaller/replaceoperation.h b/installerbuilder/libinstaller/replaceoperation.h
index 22549de99..687073fde 100644
--- a/installerbuilder/libinstaller/replaceoperation.h
+++ b/installerbuilder/libinstaller/replaceoperation.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 REPLACEOPERATION_H
#define REPLACEOPERATION_H
diff --git a/installerbuilder/libinstaller/selfrestartoperation.h b/installerbuilder/libinstaller/selfrestartoperation.h
index 12ba53e4b..5ca44826d 100644
--- a/installerbuilder/libinstaller/selfrestartoperation.h
+++ b/installerbuilder/libinstaller/selfrestartoperation.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 SELFRESTARTOPERATION_H
#define SELFRESTARTOPERATION_H
diff --git a/installerbuilder/libinstaller/setdemospathonqtoperation.h b/installerbuilder/libinstaller/setdemospathonqtoperation.h
index 4bd7b2a42..4613fc69b 100644
--- a/installerbuilder/libinstaller/setdemospathonqtoperation.h
+++ b/installerbuilder/libinstaller/setdemospathonqtoperation.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 SETDEMOSPATHONQTOPERATION_H
#define SETDEMOSPATHONQTOPERATION_H
diff --git a/installerbuilder/libinstaller/setexamplespathonqtoperation.h b/installerbuilder/libinstaller/setexamplespathonqtoperation.h
index 5f899fd09..59c7191f2 100644
--- a/installerbuilder/libinstaller/setexamplespathonqtoperation.h
+++ b/installerbuilder/libinstaller/setexamplespathonqtoperation.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 SETEXAMPLESPATHONQTOPERATION_H
#define SETEXAMPLESPATHONQTOPERATION_H
diff --git a/installerbuilder/libinstaller/setimportspathonqtcoreoperation.h b/installerbuilder/libinstaller/setimportspathonqtcoreoperation.h
index 35e81fa50..f9a68b485 100644
--- a/installerbuilder/libinstaller/setimportspathonqtcoreoperation.h
+++ b/installerbuilder/libinstaller/setimportspathonqtcoreoperation.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 SETIMPORTSPATHONQTCOREOPERATION_H
#define SETIMPORTSPATHONQTCOREOPERATION_H