Merge commit 'qt/master'

Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp

29 files changed, 51 insertions, 55 deletions

diff --git a/dist/README b/dist/README
index c9e7677..d8ab958 100644
--- a/dist/README
+++ b/dist/README
@@ -2,11 +2,11 @@ This is Qt version %VERSION%.
 
 Qt is a comprehensive cross-platform C++ application framework. Qt 4
 introduces new features and many improvements over the 3.x series. See
-http://doc.qtsoftware.com/latest/qt4-intro.html for details.
+http://qt.nokia.com/doc/latest/qt4-intro.html for details.
 
 The Qt 4.x series is not binary compatible or source compatible with
 the 3.x series. For more information on porting from Qt 3 to Qt 4, see
-http://doc.qtsoftware.com/latest/porting4.html .
+http://qt.nokia.com/doc/latest/porting4.html .
 
 
 INSTALLING Qt
@@ -37,7 +37,7 @@ The Qt reference documentation is available locally in Qt's doc/html
 directory. You can use Qt Assistant to view it; to launch Assistant,
 type 'assistant' on the command line or use the Start menu. On Mac OS
 X, you can find it in /Developer/Applications/Qt.  The latest
-documentation is available at http://doc.qtsoftware.com/ .
+documentation is available at http://qt.nokia.com/doc/ .
 
 
 SUPPORTED PLATFORMS
@@ -90,10 +90,7 @@ For this release, the following platforms have been tested:
   wincewm60standard-msvc2008
 
 For a complete list of supported platforms, see
-http://doc.qtsoftware.com/latest/supported-platforms.html
-
-For a description of Qt's platform support policy, see
-http://qtsoftware.com/support-services/support/platform-support-policy
+http://qt.nokia.com/doc/latest/supported-platforms.html.
 
 
 COMMERCIAL EDITIONS
@@ -106,15 +103,15 @@ the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
 Qt3Support modules.
 
 For a full listing of the contents of each module, please refer to 
-http://doc.qtsoftware.com/latest/modules.html
+http://qt.nokia.com/doc/latest/modules.html
 
 
 HOW TO REPORT A BUG
 
 If you think you have found a bug in Qt, we would like to hear about
 it so that we can fix it. Before reporting a bug, please check
-http://qtsoftware.com/developer/faqs/ and
-http://qtsoftware.com/products/appdev/platform/platforms/ to see if
+http://qt.nokia.com/developer/faqs/ and
+http://qt.nokia.com/products/appdev/platform/platforms/ to see if
 the issue is already known.
 
 Always include the following information in your bug report: the name
@@ -126,9 +123,9 @@ 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://qtsoftware.com/developer/task-tracker
+http://qt.nokia.com/developer/task-tracker
 
 
 Qt is a trademark of Nokia Corporation and/or its subsidiary(-ies).
diff --git a/dist/changes-2.00 b/dist/changes-2.00
index 1dcfea7..830e9c6 100644
--- a/dist/changes-2.00
+++ b/dist/changes-2.00
@@ -5,7 +5,7 @@ been significally extended and improved.
 This file will only give an overview of the main changes since version
 1.44.  A complete list would simply be too large to be useful.  For
 more detail see the online documentation which is included in this
-distribution, and also available on http://doc.trolltech.com/
+distribution, and also available on http://qt.nokia.com/doc/
 
 The Qt version 2.x series is not binary compatible with the 1.x
 series.  This means programs compiled with Qt version 1.x must be
@@ -147,5 +147,5 @@ Unlike most toolkits, Qt lets a single executable work on all three.
 * QWindowsStyle
 * QWizard
 
-For details, see e.g http://doc.trolltech.com/qcdestyle.html (or any
+For details, see e.g http://qt.nokia.com/doc/qcdestyle.html (or any
 other class name, lowercased).
diff --git a/dist/changes-2.1.0 b/dist/changes-2.1.0
index a0794cf..9d03a10 100644
--- a/dist/changes-2.1.0
+++ b/dist/changes-2.1.0
@@ -3,7 +3,7 @@ Qt 2.1 introduces new features as well as many improvements over the
 since version 2.0.2.  A complete list would simply be too large to be
 useful.  For more detail see the online documentation which is included
 in this distribution, and also available on
-http://doc.trolltech.com/
+http://qt.nokia.com/doc/
 
 The Qt version 2.1 series is binary compatible with the 2.0.x
 series - applications compiled for 2.0 will continue to run with 2.1.
diff --git a/dist/changes-2.2.0 b/dist/changes-2.2.0
index d5444a8..cbae9a9 100644
--- a/dist/changes-2.2.0
+++ b/dist/changes-2.2.0
@@ -4,7 +4,7 @@ Qt 2.2 introduces new features as well as many improvements over the
 since version 2.1.  A complete list would simply be too large to be
 useful.  For more detail see the online documentation which is
 included in this distribution, and also available on
-http://doc.trolltech.com/
+http://qt.nokia.com/doc/
 
 The Qt version 2.2 series is binary compatible with the 2.1.x and
 2.0.x series - applications compiled for 2.0 or 2.1 will continue to
diff --git a/dist/changes-3.0.0 b/dist/changes-3.0.0
index 1f6ad5b..819bc0c 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 2c73e77..e351ed1 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-3.1.0 b/dist/changes-3.1.0
index f080946..4e5876d 100644
--- a/dist/changes-3.1.0
+++ b/dist/changes-3.1.0
@@ -2,7 +2,7 @@ Qt 3.1 introduces many significant new features and many improvements
 over the 3.0.x series. This file provides an overview of the main
 changes since version 3.0.x. For further details see the online
 documentation which is included in this distribution, and also
-available at http://doc.trolltech.com/.
+available at http://qt.nokia.com/doc/.
 
 The Qt version 3.1 series is binary compatible with the 3.0.x series:
 applications compiled for 3.0 will continue to run with 3.1.
diff --git a/dist/changes-3.1.0-b1 b/dist/changes-3.1.0-b1
index 527992f..4979a50 100644
--- a/dist/changes-3.1.0-b1
+++ b/dist/changes-3.1.0-b1
@@ -2,7 +2,7 @@ Qt 3.1 introduces many significant new features and many improvements
 over the 3.0.x series. This file provides an overview of the main
 changes since version 3.0.5. For further details see the online
 documentation which is included in this distribution, and also
-available at http://doc.trolltech.com/.
+available at http://qt.nokia.com/doc/.
 
 The Qt version 3.1 series is binary compatible with the 3.0.x series:
 applications compiled for 3.0 will continue to run with 3.1.
diff --git a/dist/changes-3.2.0 b/dist/changes-3.2.0
index 6d99213..a319939 100644
--- a/dist/changes-3.2.0
+++ b/dist/changes-3.2.0
@@ -3,7 +3,7 @@ Qt 3.2 introduces new features as well as many improvements over the
 3.1.x series. This file gives an overview of the main changes since
 version 3.1.2.  For more details, see the online documentation which
 is included in this distribution. The documentation is also available
-at http://doc.trolltech.com/
+at http://qt.nokia.com/doc/
 
 The Qt version 3.2 series is binary compatible with the 3.1.x series.
 Applications compiled for 3.1 will continue to run with 3.2.
diff --git a/dist/changes-3.2.0-b1 b/dist/changes-3.2.0-b1
index cdd3514..f544330 100644
--- a/dist/changes-3.2.0-b1
+++ b/dist/changes-3.2.0-b1
@@ -3,7 +3,7 @@ Qt 3.2 introduces new features as well as many improvements over the
 3.1.x series. This file gives an overview of the main changes since
 version 3.1.2.  For more details, see the online documentation which
 is included in this distribution. The documentation is also available
-at http://doc.trolltech.com/
+at http://qt.nokia.com/doc/
 
 The Qt version 3.2 series is binary compatible with the 3.1.x series.
 Applications compiled for 3.1 will continue to run with 3.2.
diff --git a/dist/changes-3.2.0-b2 b/dist/changes-3.2.0-b2
index 98910a8..65fb4e5 100644
--- a/dist/changes-3.2.0-b2
+++ b/dist/changes-3.2.0-b2
@@ -3,7 +3,7 @@ Qt 3.2 introduces new features as well as many improvements over the
 3.1.x series. This file gives an overview of the main changes since
 version 3.1.2. For more details, see the online documentation which
 is included in this distribution. The documentation is also available
-at http://doc.trolltech.com/
+at http://qt.nokia.com/doc/
 
 The Qt version 3.2 series is binary compatible with the 3.1.x series.
 Applications compiled for 3.1 will continue to run with 3.2.
diff --git a/dist/changes-3.3.0 b/dist/changes-3.3.0
index 8523592..b386f8c 100644
--- a/dist/changes-3.3.0
+++ b/dist/changes-3.3.0
@@ -1,7 +1,7 @@
 Qt 3.3 introduces many new features as well as many improvements over
 the 3.2.x series. For more details, see the online documentation which
 is included in this distribution. The documentation is also available
-at http://doc.trolltech.com/
+at http://qt.nokia.com/doc/
 
 The Qt version 3.3 series is binary compatible with the 3.2.x series.
 Applications compiled for 3.2 will continue to run with 3.3.
diff --git a/dist/changes-3.3.0-b1 b/dist/changes-3.3.0-b1
index 8a7433b..d784439 100644
--- a/dist/changes-3.3.0-b1
+++ b/dist/changes-3.3.0-b1
@@ -1,7 +1,7 @@
 Qt 3.3 introduces many new features as well as many improvements over
 the 3.2.x series. For more details, see the online documentation which
 is included in this distribution. The documentation is also available
-at http://doc.trolltech.com/
+at http://qt.nokia.com/doc/
 
 The Qt version 3.3 series is binary compatible with the 3.2.x series.
 Applications compiled for 3.2 will continue to run with 3.3.
diff --git a/dist/changes-4.1.0 b/dist/changes-4.1.0
index 396a5b7..2468f31 100644
--- a/dist/changes-4.1.0
+++ b/dist/changes-4.1.0
@@ -1,7 +1,7 @@
 Qt 4.1 introduces many new features as well as many improvements and
 bugfixes over the 4.0.x series. For more details, see the online
 documentation which is included in this distribution. The
-documentation is also available at http://doc.trolltech.com/
+documentation is also available at http://qt.nokia.com/doc/
 
 The Qt version 4.1 series is binary compatible with the 4.0.x series.
 Applications compiled for 4.0 will continue to run with 4.1.
diff --git a/dist/changes-4.1.0-rc1 b/dist/changes-4.1.0-rc1
index fac0ce0..6047496 100644
--- a/dist/changes-4.1.0-rc1
+++ b/dist/changes-4.1.0-rc1
@@ -1,7 +1,7 @@
 Qt 4.1 introduces many new features as well as many improvements and
 bugfixes over the 4.0.x series. For more details, see the online
 documentation which is included in this distribution. The
-documentation is also available at http://doc.trolltech.com/
+documentation is also available at http://qt.nokia.com/doc/
 
 The Qt version 4.1 series is binary compatible with the 4.0.x series.
 Applications compiled for 4.0 will continue to run with 4.1.
diff --git a/dist/changes-4.2.0 b/dist/changes-4.2.0
index f42da27..96a090f 100644
--- a/dist/changes-4.2.0
+++ b/dist/changes-4.2.0
@@ -1,7 +1,7 @@
 Qt 4.2 introduces many new features as well as many improvements and
 bugfixes over the 4.1.x series. For more details, see the online
 documentation which is included in this distribution. The
-documentation is also available at http://doc.trolltech.com/
+documentation is also available at http://qt.nokia.com/doc/
 
 The Qt version 4.2 series is binary compatible with the 4.1.x series.
 Applications compiled for 4.1 will continue to run with 4.2.
diff --git a/dist/changes-4.2.0-tp1 b/dist/changes-4.2.0-tp1
index b2a994d..e0c63bb 100644
--- a/dist/changes-4.2.0-tp1
+++ b/dist/changes-4.2.0-tp1
@@ -1,7 +1,7 @@
 Qt 4.2 introduces many new features as well as many improvements and
 bugfixes over the 4.1.x series. For more details, see the online
 documentation which is included in this distribution. The
-documentation is also available at http://doc.trolltech.com/
+documentation is also available at http://qt.nokia.com/doc/
 
 The Qt version 4.2 series is binary compatible with the 4.1.x series.
 Applications compiled for 4.0 or 4.1 will continue to run with 4.2.
@@ -15,6 +15,6 @@ final release.
 
 For this tech preview, please concentrate on the new features and provide
 feedback on the qt4-preview-feedback mailing list (see
-http://lists.trolltech.com/ for details)
+http://qt.nokia.com/lists/ for details)
 
 
diff --git a/dist/changes-4.3.0 b/dist/changes-4.3.0
index f4e1d1a..c0bcc48 100644
--- a/dist/changes-4.3.0
+++ b/dist/changes-4.3.0
@@ -1,7 +1,7 @@
 Qt 4.3 introduces many new features as well as many improvements and
 bugfixes over the 4.2.x series. For more details, see the online
 documentation which is included in this distribution. The
-documentation is also available at http://doc.trolltech.com/4.3
+documentation is also available at http://qt.nokia.com/doc/4.3
 
 The Qt version 4.3 series is binary compatible with the 4.2.x series.
 Applications compiled for 4.2 will continue to run with 4.3.
@@ -13,7 +13,7 @@ in Platform Specific Changes below.
 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.
@@ -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.
+      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 2bec4e6..ac96a14 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 5bf6da0..7933426 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 7875f2c..a33b510 100644
--- a/dist/changes-4.4.0
+++ b/dist/changes-4.4.0
@@ -1,7 +1,7 @@
 Qt 4.4 introduces many new features as well as many improvements and
 bugfixes over the 4.3.x series. For more details, see the online
 documentation which is included in this distribution. The
-documentation is also available at http://doc.trolltech.com/4.4
+documentation is also available at http://qt.nokia.com/doc/4.4
 
 The Qt version 4.4 series is binary compatible with the 4.3.x series.
 The Qt for Embedded Linux version 4.4 series is binary compatible with the
@@ -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 4995a86..c009169 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 192bbd1..c440375 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 f33cede..5b7bef7 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.
diff --git a/dist/changes-4.5.0 b/dist/changes-4.5.0
index 3fc075f..64514fb 100644
--- a/dist/changes-4.5.0
+++ b/dist/changes-4.5.0
@@ -2,7 +2,7 @@ Qt 4.5 introduces many new features and improvements as well as bugfixes
 over the 4.4.x series. For more details, refer to the online documentation
 included in this distribution. The documentation is also available online:
 
-  http://doc.trolltech.com/4.5
+  http://qt.nokia.com/doc/4.5
 
 The Qt version 4.5 series is binary compatible with the 4.4.x series.
 Applications compiled for 4.4 will continue to run with 4.5.
@@ -10,7 +10,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.qtsoftware.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.5.1 b/dist/changes-4.5.1
index c9e689f..d2c620c 100644
--- a/dist/changes-4.5.1
+++ b/dist/changes-4.5.1
@@ -3,7 +3,7 @@ compatibility (source and binary) with Qt 4.5.0.  For more details,
 refer to the online documentation included in this distribution. The
 documentation is also available online:
 
-  http://doc.trolltech.com/4.5
+  http://qt.nokia.com/doc/4.5
 
 The Qt version 4.5 series is binary compatible with the 4.4.x series.
 Applications compiled for 4.4 will continue to run with 4.5.
@@ -11,7 +11,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.qtsoftware.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.5.2 b/dist/changes-4.5.2
index 163e476..9a7b5e4 100644
--- a/dist/changes-4.5.2
+++ b/dist/changes-4.5.2
@@ -3,7 +3,7 @@ compatibility (source and binary) with Qt 4.5.1. For more details,
 refer to the online documentation included in this distribution. The
 documentation is also available online:
 
-  http://doc.qtsoftware.com/4.5
+  http://qt.nokia.com/doc/4.5
 
 The Qt version 4.5 series is binary compatible with the 4.4.x series.
 Applications compiled for 4.4 will continue to run with 4.5.
@@ -11,7 +11,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.qtsoftware.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.5.3 b/dist/changes-4.5.3
index 096d28c..df282b0 100644
--- a/dist/changes-4.5.3
+++ b/dist/changes-4.5.3
@@ -3,7 +3,7 @@ compatibility (source and binary) with Qt 4.5.0.  For more details,
 refer to the online documentation included in this distribution. The
 documentation is also available online:
 
-  http://doc.trolltech.com/4.5
+  http://qt.nokia.com/doc/4.5
 
 The Qt version 4.5 series is binary compatible with the 4.4.x series.
 Applications compiled for 4.4 will continue to run with 4.5.
@@ -11,7 +11,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.qtsoftware.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.6.0 b/dist/changes-4.6.0
index 7a6decf..bf18b14 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -2,7 +2,7 @@ Qt 4.6 introduces many new features and improvements as well as bugfixes
 over the 4.5.x series. For more details, refer to the online documentation
 included in this distribution. The documentation is also available online:
 
-  http://doc.trolltech.com/4.6
+  http://qt.nokia.com/doc/4.6
 
 The Qt version 4.6 series is binary compatible with the 4.5.x series.
 Applications compiled for 4.5 will continue to run with 4.6.
@@ -10,7 +10,7 @@ Applications compiled for 4.5 will continue to run with 4.6.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.qtsoftware.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.