From fc512f716dad7dcb0c1a560ad516eae284fce1bb Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 26 Oct 2009 12:08:05 +0100
Subject: [PATCH] some forgotten license header changes. also, use Nokia
instead of Trolltech.
---
doc/addressbook-sdk.qdoc | 36 +++++++------------
share/qtcreator/gdbmacros/gdbmacros_p.h | 36 +++++++------------
.../test/auto/pluginspec/testspecs/spec1.xml | 6 ++--
.../auto/pluginspec/testspecs/spec_wrong1.xml | 6 ++--
.../auto/pluginspec/testspecs/spec_wrong2.xml | 6 ++--
.../auto/pluginspec/testspecs/spec_wrong3.xml | 6 ++--
.../auto/pluginspec/testspecs/spec_wrong4.xml | 6 ++--
.../auto/pluginspec/testspecs/spec_wrong5.xml | 6 ++--
8 files changed, 42 insertions(+), 66 deletions(-)
diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc
index 7d7734bea78..9737100f255 100644
--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
@@ -1,18 +1,20 @@
-/****************************************************************************
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the documentation of the Qt Toolkit.
+** Commercial Usage
**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
**
** 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
@@ -20,24 +22,10 @@
** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
**
-****************************************************************************/
+**************************************************************************/
/*!
\page tutorials-addressbook-sdk.html
diff --git a/share/qtcreator/gdbmacros/gdbmacros_p.h b/share/qtcreator/gdbmacros/gdbmacros_p.h
index fc6b665e9ad..88867b02b2f 100644
--- a/share/qtcreator/gdbmacros/gdbmacros_p.h
+++ b/share/qtcreator/gdbmacros/gdbmacros_p.h
@@ -1,18 +1,20 @@
-/****************************************************************************
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Assistant of the Qt Toolkit.
+** Commercial Usage
**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
**
** 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
@@ -20,24 +22,10 @@
** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
**
-****************************************************************************/
+**************************************************************************/
#ifndef GDBMACROS_P_H
#define GDBMACROS_P_H
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec1.xml b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec1.xml
index 31cebf44146..994f330bbe6 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec1.xml
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec1.xml
@@ -1,6 +1,6 @@
<plugin name="test" version="1.0.1" compatVersion="1.0.0">
- <vendor>Trolltech</vendor>
- <copyright>(C) 2007 Trolltech ASA</copyright>
+ <vendor>Nokia Corporation</vendor>
+ <copyright>(C) 2007 Nokia Corporation</copyright>
<license>
This is a default license bla
blubbblubb
@@ -10,7 +10,7 @@ end of terms
This plugin is just a test.
it demonstrates the great use of the plugin spec.
</description>
- <url>http://www.trolltech.com</url>
+ <url>http://qt.noki.com</url>
<dependencyList>
<dependency name="SomeOtherPlugin" version="2.3.0_2"/>
<dependency name="EvenOther" version="1.0.0"/>
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong1.xml b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong1.xml
index e6fe956c98e..ffcb61241e9 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong1.xml
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong1.xml
@@ -1,6 +1,6 @@
<something name="test" version="1.0.1" compatVersion="1.0.0">
- <vendor>Trolltech</vendor>
- <copyright>(C) 2007 Trolltech ASA</copyright>
+ <vendor>Nokia Corporation</vendor>
+ <copyright>(C) 2007 Nokia Corporation</copyright>
<license>
This is a default license bla
blubbblubb
@@ -10,7 +10,7 @@ end of terms
This plugin is just a test.
it demonstrates the great use of the plugin spec.
</description>
- <url>http://www.trolltech.com</url>
+ <url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="SomeOtherPlugin" version="2.3.0_2"/>
<dependency name="EvenOther" version="1.0.0"/>
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong2.xml b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong2.xml
index 200a1fd1ac1..917acf78ad7 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong2.xml
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong2.xml
@@ -1,6 +1,6 @@
<plugin version="1.0.1" compatVersion="1.0.0">
- <vendor>Trolltech</vendor>
- <copyright>(C) 2007 Trolltech ASA</copyright>
+ <vendor>Nokia Corporation</vendor>
+ <copyright>(C) 2007 Nokia Corporation</copyright>
<license>
This is a default license bla
blubbblubb
@@ -10,7 +10,7 @@ end of terms
This plugin is just a test.
it demonstrates the great use of the plugin spec.
</description>
- <url>http://www.trolltech.com</url>
+ <url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="SomeOtherPlugin" version="2.3.0_2"/>
<dependency name="EvenOther" version="1.0.0"/>
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong3.xml b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong3.xml
index 13bbdb09a8d..d79ab4492bc 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong3.xml
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong3.xml
@@ -1,6 +1,6 @@
<plugin name="test" compatVersion="1.0.0">
- <vendor>Trolltech</vendor>
- <copyright>(C) 2007 Trolltech ASA</copyright>
+ <vendor>Nokia Corporation</vendor>
+ <copyright>(C) 2007 Nokia Corporation</copyright>
<license>
This is a default license bla
blubbblubb
@@ -10,7 +10,7 @@ end of terms
This plugin is just a test.
it demonstrates the great use of the plugin spec.
</description>
- <url>http://www.trolltech.com</url>
+ <url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="SomeOtherPlugin" version="2.3.0_2"/>
<dependency name="EvenOther" version="1.0.0"/>
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong4.xml b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong4.xml
index b904f901387..849f165f9ca 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong4.xml
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong4.xml
@@ -1,6 +1,6 @@
<plugin name="test" version="1.0.1" compatVersion="1.0.0">
- <vendor>Trolltech</vendor>
- <copyright>(C) 2007 Trolltech ASA</copyright>
+ <vendor>Nokia Corporation</vendor>
+ <copyright>(C) 2007 Nokia Corporation</copyright>
<license>
This is a default license bla
blubbblubb
@@ -10,7 +10,7 @@ end of terms
This plugin is just a test.
it demonstrates the great use of the plugin spec.
</description>
- <url>http://www.trolltech.com</url>
+ <url>http://qt.nokia.com</url>
<dependencyList>
<dependency version="2.3.0_2"/>
<dependency name="EvenOther" version="1.0.0"/>
diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong5.xml b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong5.xml
index 1c110d1eeae..03936fd88c0 100644
--- a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong5.xml
+++ b/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong5.xml
@@ -1,6 +1,6 @@
<plugin name="test" version="1.0.1" compatVersion="1.0.0">
- <vendor>Trolltech</vendor>
- <copyright>(C) 2007 Trolltech ASA</copyright>
+ <vendor>Nokia Corporation</vendor>
+ <copyright>(C) 2007 Nokia Corporation</copyright>
<license>
This is a default license bla
blubbblubb
@@ -10,7 +10,7 @@ end of terms
This plugin is just a test.
it demonstrates the great use of the plugin spec.
</description>
- <url>http://www.trolltech.com</url>
+ <url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="SomeOtherPlugin" version="2.3aa.0_2"/>
<dependency name="EvenOther" version="1.0.0"/>
--
GitLab