summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/setexamplespathonqtoperation.cpp
diff options
context:
space:
mode:
authorNiels Weber <niels.2.weber@nokia.com>2012-02-06 10:49:11 +0100
committerTim Jenssen <tim.jenssen@nokia.com>2012-02-06 11:02:41 +0100
commit96dbcd310f23dbf755b486349e5ed49ca7b5c87a (patch)
tree55ae9f70883ee7830ffd2ef31938cc9fbf437d92 /installerbuilder/libinstaller/setexamplespathonqtoperation.cpp
parentc0403b40c4be72a5b1ed6206028e8551387c2f5c (diff)
more license header fixes
Change-Id: I0ad47f49fa770286073ed41ebf0b57abd65d6eb2 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder/libinstaller/setexamplespathonqtoperation.cpp')
-rw-r--r--installerbuilder/libinstaller/setexamplespathonqtoperation.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/installerbuilder/libinstaller/setexamplespathonqtoperation.cpp b/installerbuilder/libinstaller/setexamplespathonqtoperation.cpp
index 41eb33a5a..d29d43333 100644
--- a/installerbuilder/libinstaller/setexamplespathonqtoperation.cpp
+++ b/installerbuilder/libinstaller/setexamplespathonqtoperation.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 "setexamplespathonqtoperation.h"
#include "qtpatch.h"