summaryrefslogtreecommitdiffstats
path: root/installerbuilder/installerbase/installerbase.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2011-11-28 17:03:44 +0100
committerKarsten Heimrich <karsten.heimrich@nokia.com>2011-11-29 12:17:58 +0100
commit46beee422bef7d529bd120cb680d15d7dfc305bf (patch)
tree7eaf03167c3835ef864a19540d43523599927ff9 /installerbuilder/installerbase/installerbase.cpp
parent4fcd529a845564be6a9d2b44f00b002f244f6bda (diff)
Update to the latest and greatest...
Change-Id: I7f0fb12735293e785229da22a8e794c2f7d7df96 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Diffstat (limited to 'installerbuilder/installerbase/installerbase.cpp')
-rw-r--r--installerbuilder/installerbase/installerbase.cpp25
1 files changed, 12 insertions, 13 deletions
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index 719ff0877..2ea1b6fd3 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -1,17 +1,11 @@
/**************************************************************************
**
-** This file is part of Qt SDK**
+** This file is part of Installer Framework
**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2010, 2011 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.
**
**************************************************************************/
#include "installerbase_p.h"