Fix licenses.

Change-Id: I834bc5da86c97ddaeefb43011444da8ed0e85180
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

diff --git a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp
index bb8279a..16ac2b9 100644 (file)
--- a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp
@@ -1,65 +1,33 @@
 /**************************************************************************
-
 **
-
-**  This  file  is  part  of  Qt  Creator
-
+** This file is part of Qt Creator
 **
-
-**  Copyright  (c)  2011  Nokia  Corporation  and/or  its  subsidiary(-ies).
-
+** Copyright (c) 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
 **
-
-**  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.
 **
-
-**  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.
-
+** 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.
 **
-
-**  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
 **
-
-**  If  you  have  questions  regarding  the  use  of  this  file,  please  contact
-
-**  Nokia  at  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 "tokencommand.h"

diff --git a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
index ef4325a..f41ec36 100644 (file)
--- a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
@@ -1,65 +1,33 @@
 /**************************************************************************
-
 **
-
-**  This  file  is  part  of  Qt  Creator
-
+** This file is part of Qt Creator
 **
-
-**  Copyright  (c)  2011  Nokia  Corporation  and/or  its  subsidiary(-ies).
-
+** Copyright (c) 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
 **
-
-**  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.
 **
-
-**  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.
-
+** 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.
 **
-
-**  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
 **
-
-**  If  you  have  questions  regarding  the  use  of  this  file,  please  contact
-
-**  Nokia  at  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 QMLDESIGNER_TOKENCOMMAND_H

diff --git a/src/plugins/cpptools/cpptoolsreuse.h b/src/plugins/cpptools/cpptoolsreuse.h
index 3be5838..e6a2dbf 100644 (file)
--- a/src/plugins/cpptools/cpptoolsreuse.h
+++ b/src/plugins/cpptools/cpptoolsreuse.h
@@ -1,3 +1,35 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 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 CPPTOOLSREUSE_H
 #define CPPTOOLSREUSE_H
 

diff --git a/src/plugins/remotelinux/startgdbserverdialog.cpp b/src/plugins/remotelinux/startgdbserverdialog.cpp
index f0fe27a..1d03976 100644 (file)
--- a/src/plugins/remotelinux/startgdbserverdialog.cpp
+++ b/src/plugins/remotelinux/startgdbserverdialog.cpp
@@ -1,3 +1,35 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 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.
+**
+**************************************************************************/
+
 #include "startgdbserverdialog.h"
 #include "ui_startgdbserverdialog.h"
 

diff --git a/src/plugins/remotelinux/startgdbserverdialog.h b/src/plugins/remotelinux/startgdbserverdialog.h
index ba7e32b..a47f250 100644 (file)
--- a/src/plugins/remotelinux/startgdbserverdialog.h
+++ b/src/plugins/remotelinux/startgdbserverdialog.h
@@ -1,3 +1,35 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 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 STARTGDBSERVERDIALOG_H
 #define STARTGDBSERVERDIALOG_H
 

diff --git a/src/tools/qmlprofilertool/constants.h b/src/tools/qmlprofilertool/constants.h
index fa942d8..ee11a16 100644 (file)
--- a/src/tools/qmlprofilertool/constants.h
+++ b/src/tools/qmlprofilertool/constants.h
@@ -1,3 +1,35 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 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 CONSTANTS_H
 #define CONSTANTS_H