Eliminate some mentions of Trolltech.

Reviewed-by: Trust Me

10 files changed, 14 insertions, 15 deletions

diff --git a/dist/README b/dist/README
index c941593955..770bb79166 100644
--- a/dist/README
+++ b/dist/README
@@ -123,7 +123,7 @@ If the problem you are reporting is only visible at run-time, try to
 create a small test program that shows the problem when run. Often,
 such a program can be created with some minor changes to one of the
 many example programs in Qt's examples directory. Please submit the
-bug report using the Task Tracker on the Trolltech website:
+bug report using the Task Tracker on the Qt website:
 
 http://qt.nokia.com/developer/task-tracker
 
diff --git a/dist/changes-3.0.0 b/dist/changes-3.0.0
index 1f6ad5bf38..4f8776bb97 100644
--- a/dist/changes-3.0.0
+++ b/dist/changes-3.0.0
@@ -433,8 +433,8 @@ from one single project description. It is the C++ successor of
 'tmake' which required Perl.
 
 qmake offers additional functionallity that is difficult to reproduce
-in tmake. Trolltech uses qmake in its build system for Qt and related
-products and we have released it as free software.
+in tmake. Qt uses qmake in its build system and we have released it
+as free software.
 
 
 
diff --git a/dist/changes-3.0.0-beta1 b/dist/changes-3.0.0-beta1
index 2c73e7744b..37f4c36628 100644
--- a/dist/changes-3.0.0-beta1
+++ b/dist/changes-3.0.0-beta1
@@ -405,9 +405,8 @@ QMake
 
 To ease portability we now provide the qmake utility to replace tmake.
 QMake is a C++ version of tmake which offers additional functionallity
-that is difficult to reproduce in tmake. Trolltech uses qmake in its
-build system for Qt and related products and we have released it as
-free software.
+that is difficult to reproduce in tmake. Qt uses qmake in its build
+system and we have released it as free software.
 
 
 Qt Functions
diff --git a/dist/changes-4.3.0 b/dist/changes-4.3.0
index f4e1d1a393..bc0f636f2f 100644
--- a/dist/changes-4.3.0
+++ b/dist/changes-4.3.0
@@ -34,7 +34,7 @@ General Improvements
 - Documentation and Examples
     * Added information about the TS file format used in Linguist.
     * Moved platform and compiler support information from
-      www.trolltech.com into the documentation.
+      Qt website into the documentation.
     * Added an Accessibility overview document.
     * Added new example to show usage of QCompleter with custom tree models.
 
diff --git a/dist/changes-4.3.2 b/dist/changes-4.3.2
index 2bec4e643f..ac96a14e40 100644
--- a/dist/changes-4.3.2
+++ b/dist/changes-4.3.2
@@ -16,7 +16,7 @@ General Improvements
     * This version adds the Academic Free License 3.0, Artistic License 2.0,
       Zope Public License 2.1 and Eclipse Public License to the GPL
       Exception for developers using the Open Source Edition of Qt.
-      See the Trolltech GPL Exception Version 1.1 page in the documentation
+      See the GPL Exception Version 1.1 page in the documentation
       for more information.
 
 Tools
@@ -542,7 +542,7 @@ Mac OS X
       the August Leopard pre-release (build 9A527) will not show any windows
       because of a regression in the Carbon library. This has been addressed
       for a future OS X release. In the meantime, if you *must* test your
-      application against this Leopard build, please contact Trolltech.
+      application against this Leopard build, please contact us.
     * [178551] Fixed a regression that made it impossible to deliver mouse
       move events to other widgets after a double-click on a widget that was
       immediately hidden as a result of the double-click event.
diff --git a/dist/changes-4.3.3 b/dist/changes-4.3.3
index 5bf6da0c08..7933426623 100644
--- a/dist/changes-4.3.3
+++ b/dist/changes-4.3.3
@@ -17,7 +17,7 @@ General Improvements
     * This version adds the Common Development and Distribution License
       (CDDL) to the GPL Exception for developers using the Open Source
       Edition of Qt.
-      See the Trolltech GPL Exception Version 1.1 page in the documentation
+      See the GPL Exception Version 1.1 page in the documentation
       for more information.
     * This version upgrades the Qt Commercial License to version 3.4,
       the Qtopia Core Commercial License to 1.2 and the Qt Academic
diff --git a/dist/changes-4.4.0 b/dist/changes-4.4.0
index 7875f2c48a..81eb8ab6fd 100644
--- a/dist/changes-4.4.0
+++ b/dist/changes-4.4.0
@@ -11,7 +11,7 @@ run with 4.4.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.trolltech.com/developer/task-tracker
+  http://qt.nokia.com/developer/task-tracker
 
 Each of these identifiers can be entered in the task tracker to obtain
 more information about a particular change.
@@ -939,7 +939,7 @@ Third party components
       requested.
 
 - QPrintEngine
-    * [193986] Fixed the Trolltech copyright date on PDF files
+    * [193986] Fixed the copyright date on PDF files
 
 - QProcess
     * [162522] QProcess now emits stateChanged() consistently for all state
diff --git a/dist/changes-4.4.1 b/dist/changes-4.4.1
index 4995a86836..c0091691b4 100644
--- a/dist/changes-4.4.1
+++ b/dist/changes-4.4.1
@@ -9,7 +9,7 @@ and 4.3 will continue to run with 4.4.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.trolltech.com/developer/task-tracker
+  http://qt.nokia.com/developer/task-tracker
 
 Each of these identifiers can be entered in the task tracker to obtain
 more information about a particular change.
diff --git a/dist/changes-4.4.2 b/dist/changes-4.4.2
index 192bbd108a..c4403754c1 100644
--- a/dist/changes-4.4.2
+++ b/dist/changes-4.4.2
@@ -9,7 +9,7 @@ and 4.3 will continue to run with 4.4.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.trolltech.com/developer/task-tracker
+  http://qt.nokia.com/developer/task-tracker
 
 Each of these identifiers can be entered in the task tracker to obtain
 more information about a particular change.
diff --git a/dist/changes-4.4.3 b/dist/changes-4.4.3
index f33cede92b..5b7bef7eb4 100644
--- a/dist/changes-4.4.3
+++ b/dist/changes-4.4.3
@@ -10,7 +10,7 @@ and 4.3 will continue to run with 4.4.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.trolltech.com/developer/task-tracker
+  http://qt.nokia.com/developer/task-tracker
 
 Each of these identifiers can be entered in the task tracker to obtain
 more information about a particular change.