Update references to online documentation.

Reviewed-by: Trust Me

52 files changed, 84 insertions, 84 deletions

diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel
index 6211811..fd9c4a5 100644
--- a/demos/browser/data/defaultbookmarks.xbel
+++ b/demos/browser/data/defaultbookmarks.xbel
@@ -9,10 +9,10 @@
         <bookmark href="http://webkit.org/">
             <title>WebKit.org</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/">
+        <bookmark href="http://qt.nokia.com/doc/">
             <title>Qt Documentation</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/qq/">
+        <bookmark href="http://qt.nokia.com/doc/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
         <bookmark href="http://labs.trolltech.com/">
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.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..e8b7a46 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.
diff --git a/dist/changes-4.3.0 b/dist/changes-4.3.0
index f4e1d1a..e63c764 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.
diff --git a/dist/changes-4.4.0 b/dist/changes-4.4.0
index 7875f2c..e47ea98 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
diff --git a/dist/changes-4.5.0 b/dist/changes-4.5.0
index fbb2c8f..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.
diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1
index cb541da..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.
diff --git a/dist/changes-4.5.3 b/dist/changes-4.5.3
index 09214c2..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.
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 9685168..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.
diff --git a/doc/src/distributingqt.qdoc b/doc/src/distributingqt.qdoc
index 1b2023f..0739976 100644
--- a/doc/src/distributingqt.qdoc
+++ b/doc/src/distributingqt.qdoc
@@ -64,13 +64,13 @@ System-specific Notes\endlink.)
 \tableofcontents
 
 Also see the "deployment" articles in
-\e{\link http://doc.trolltech.com/qq/ Qt Quarterly\endlink}:
+\e{\link http://qt.nokia.com/doc/qq/ Qt Quarterly\endlink}:
 \list
-\i \link http://doc.trolltech.com/qq/qq09-mac-deployment.html
+\i \link http://qt.nokia.com/doc/qq/qq09-mac-deployment.html
 Deploying Applications on Mac OS X\endlink
-\i \link http://doc.trolltech.com/qq/qq10-windows-deployment.html
+\i \link http://qt.nokia.com/doc/qq/qq10-windows-deployment.html
 Deploying Applications on Windows\endlink
-\i \link http://doc.trolltech.com/qq/qq11-unix-deployment.html
+\i \link http://qt.nokia.com/doc/qq/qq11-unix-deployment.html
 Deploying Applications on X11\endlink
 \endlist
 
diff --git a/doc/src/eventsandfilters.qdoc b/doc/src/eventsandfilters.qdoc
index 95091c0..a67e523 100644
--- a/doc/src/eventsandfilters.qdoc
+++ b/doc/src/eventsandfilters.qdoc
@@ -101,7 +101,7 @@
     event delivery mechanisms are flexible. The documentation for
     QCoreApplication::notify() concisely tells the whole story; the
     \e{Qt Quarterly} article
-    \l{http://doc.trolltech.com/qq/qq11-events.html}{Another Look at Events}
+    \l{http://qt.nokia.com/doc/qq/qq11-events.html}{Another Look at Events}
     rehashes it less concisely. Here we will explain enough for 95%
     of applications.
 
diff --git a/doc/src/examples-overview.qdoc b/doc/src/examples-overview.qdoc
index b1b2898..50c19fa 100644
--- a/doc/src/examples-overview.qdoc
+++ b/doc/src/examples-overview.qdoc
@@ -358,10 +358,10 @@
   available. It provides an overview of each example, lets you view the
   documentation in Qt Assistant, and is able to launch examples and demos.
 
-  \section1 \l{http://doc.trolltech.com/qq}{Another Source of Examples}
+  \section1 \l{http://qt.nokia.com/doc/qq}{Another Source of Examples}
 
   One more valuable source for examples and explanations of Qt
-  features is the archive of the \l {http://doc.trolltech.com/qq} 
+  features is the archive of the \l {http://qt.nokia.com/doc/qq} 
   {Qt Quarterly}.
 
 */
diff --git a/doc/src/how-to-learn-qt.qdoc b/doc/src/how-to-learn-qt.qdoc
index 612ced0..ee23509 100644
--- a/doc/src/how-to-learn-qt.qdoc
+++ b/doc/src/how-to-learn-qt.qdoc
@@ -105,7 +105,7 @@
     including translations to various languages.
 
     Another valuable source of example code and explanations of Qt
-    features is the archive of articles from \l {http://doc.trolltech.com/qq}
+    features is the archive of articles from \l {http://qt.nokia.com/doc/qq}
     {Qt Quarterly}, a quarterly newsletter for users of Qt.
 
     For documentation on specific Qt modules and other guides, refer to
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 6fb4c8e..962e63d 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -121,7 +121,7 @@
         <ul>
         <li><a href="http://qt.nokia.com/developer/faqs/">Frequently Asked Questions</a></li>
         <li><a href="http://qt.nokia.com/developer/community/">Qt Community Web Sites</a></li>
-        <li><a href="http://doc.trolltech.com/qq/">Qt Quarterly</a></li>
+        <li><a href="http://qt.nokia.com/doc/qq/">Qt Quarterly</a></li>
         <li><a href="bughowto.html">How to Report a Bug</a></li>
         <li><a href="http://qt.nokia.com/developer/">Other Online Resources</a></li>
         </ul>
diff --git a/doc/src/layout.qdoc b/doc/src/layout.qdoc
index 0ab0393..dc75bc6 100644
--- a/doc/src/layout.qdoc
+++ b/doc/src/layout.qdoc
@@ -243,7 +243,7 @@
 
     For further guidance when implementing these functions, see the
     \e{Qt Quarterly} article
-    \l{http://doc.trolltech.com/qq/qq04-height-for-width.html}
+    \l{http://qt.nokia.com/doc/qq/qq04-height-for-width.html}
     {Trading Height for Width}.
 
 
diff --git a/doc/src/linguist-manual.qdoc b/doc/src/linguist-manual.qdoc
index 4b175ed..a67d65a 100644
--- a/doc/src/linguist-manual.qdoc
+++ b/doc/src/linguist-manual.qdoc
@@ -1414,8 +1414,8 @@
     \c -pluralonly command line option, which allows the creation of
     TS files containing only entries with plural forms.
 
-    See the \l{http://doc.trolltech.com/qq/}{Qt Quarterly} Article 
-    \l{http://doc.trolltech.com/qq/qq19-plurals.html}{Plural Forms in Translations}
+    See the \l{http://qt.nokia.com/doc/qq/}{Qt Quarterly} Article 
+    \l{http://qt.nokia.com/doc/qq/qq19-plurals.html}{Plural Forms in Translations}
     for further details on this issue.
 
     \section2 Coping With C++ Namespaces
diff --git a/doc/src/porting4.qdoc b/doc/src/porting4.qdoc
index bd656fb..937885f 100644
--- a/doc/src/porting4.qdoc
+++ b/doc/src/porting4.qdoc
@@ -473,7 +473,7 @@
     \section1 Explicit Sharing
 
     Qt 4 is the first version of Qt that contains no \link
-    http://doc.trolltech.com/3.3/shclass.html explicitly shared
+    http://qt.nokia.com/doc/3.3/shclass.html explicitly shared
     \endlink classes. All classes that were explicitly shared in Qt 3
     are \e implicitly shared in Qt 4:
 
@@ -1080,7 +1080,7 @@
     ensuring that the string is '\\0'-terminated. Another important
     issue was that conversions between \c QCString and QByteArray often
     gave confusing results. (See the
-    \l{http://doc.trolltech.com/qq/qq05-achtung.html#qcstringisastringofchars}{Achtung!
+    \l{http://qt.nokia.com/doc/qq/qq05-achtung.html#qcstringisastringofchars}{Achtung!
     Binary and Character Data} article in \e{Qt Quarterly} for an
     overview of the pitfalls.)
 
@@ -2441,13 +2441,13 @@
     that provides the old semantics. See the Q3Painter documentation
     for details and for the reasons why we had to make this change.
 
-    The \l{http://doc.trolltech.com/3.3/qpainter.html#CoordinateMode-enum}{QPainter::CoordinateMode}
+    The \l{http://qt.nokia.com/doc/3.3/qpainter.html#CoordinateMode-enum}{QPainter::CoordinateMode}
     enum has been removed in Qt 4. All clipping
     operations are now defined using logical coordinates and are subject
     to transformation operations.
 
     The
-    \l{http://doc.trolltech.com/3.3/qpainter.html#RasterOP-enum}{QPainter::RasterOP}
+    \l{http://qt.nokia.com/doc/3.3/qpainter.html#RasterOP-enum}{QPainter::RasterOP}
     enum has been replaced with QPainter::CompositionMode.
 
     \section1 QPicture
@@ -3259,7 +3259,7 @@
 
     \list \o If you use Q3SocketDevice in a thread to perform blocking
     network I/O (a technique encouraged by the \e{Qt Quarterly}
-    article \l{http://doc.trolltech.com/qq/qq09-networkthread.html}
+    article \l{http://qt.nokia.com/doc/qq/qq09-networkthread.html}
     {Unblocking Networking}), you can now use QTcpSocket, QFtp, or
     QNetworkAccessManager, which can be used from non-GUI threads.
 
@@ -4054,7 +4054,7 @@
 
     Sample code on how to do obtain similar behavior from Qt 4, previously
     handled by some of the above functions can be found in the
-    \l{http://doc.trolltech.com/qwidget-qt3.html}{Qt 3 Support Members for QWidget}
+    \l{http://qt.nokia.com/doc/qwidget-qt3.html}{Qt 3 Support Members for QWidget}
     page.
 
     A widget now receives change events in its QWidget::changeEvent()
@@ -4152,7 +4152,7 @@
     clearWFlags() has no direct replacement. You can use
     QWidget::setAttribute() instead. For example,
     \c{setAttribute(..., false)} to clear an attribute. More information
-    is available \l{http://doc.trolltech.com/qwidget.html#setAttribute}{here}.
+    is available \l{http://qt.nokia.com/doc/qwidget.html#setAttribute}{here}.
 
     testWFlags() was renamed to \l{QWidget::testAttribute()}{testAttribute()}.
 
diff --git a/doc/src/resources.qdoc b/doc/src/resources.qdoc
index 42827a9..f8e9124 100644
--- a/doc/src/resources.qdoc
+++ b/doc/src/resources.qdoc
@@ -55,7 +55,7 @@
     The resource system is based on tight cooperation between \l qmake,
     \l rcc (Qt's resource compiler), and QFile. It obsoletes Qt 3's
     \c qembed tool and the
-    \l{http://doc.trolltech.com/qq/qq05-iconography.html#imagestorage}{image
+    \l{http://qt.nokia.com/doc/qq/qq05-iconography.html#imagestorage}{image
     collection} mechanism.
 
     \section1 Resource Collection Files (\c{.qrc})
diff --git a/doc/src/snippets/code/src_xml_dom_qdom.cpp b/doc/src/snippets/code/src_xml_dom_qdom.cpp
index 50a4124..622295d 100644
--- a/doc/src/snippets/code/src_xml_dom_qdom.cpp
+++ b/doc/src/snippets/code/src_xml_dom_qdom.cpp
@@ -77,9 +77,9 @@ QDomElement e = //...
 //...
 QDomAttr a = e.attributeNode("href");
 cout << a.value() << endl;                // prints "http://qt.nokia.com"
-a.setValue("http://doc.trolltech.com"); // change the node's attribute
+a.setValue("http://qt.nokia.com/doc"); // change the node's attribute
 QDomAttr a2 = e.attributeNode("href");
-cout << a2.value() << endl;               // prints "http://doc.trolltech.com"
+cout << a2.value() << endl;               // prints "http://qt.nokia.com/doc"
 //! [8]
 
 
diff --git a/doc/src/snippets/qmake/comments.pro b/doc/src/snippets/qmake/comments.pro
index 189d271..390444b 100644
--- a/doc/src/snippets/qmake/comments.pro
+++ b/doc/src/snippets/qmake/comments.pro
@@ -5,6 +5,6 @@
 
 #! [1]
 # To include a literal hash character, use the $$LITERAL_HASH variable:
-urlPieces = http://doc.trolltech.com/4.0/qtextdocument.html pageCount
+urlPieces = http://qt.nokia.com/doc/4.0/qtextdocument.html pageCount
 message($$join(urlPieces, $$LITERAL_HASH))
 #! [1]
diff --git a/examples/tutorials/addressbook-fr/README b/examples/tutorials/addressbook-fr/README
index 2d528b5..3598593 100644
--- a/examples/tutorials/addressbook-fr/README
+++ b/examples/tutorials/addressbook-fr/README
@@ -4,7 +4,7 @@ Qt documentation, which can be viewed using Qt Assistant or a Web browser.
 
 The tutorial is also available online at
 
-http://doc.trolltech.com/4.4/tutorial.html
+http://qt.nokia.com/doc/4.4/tutorial.html
 
 All programs corresponding to the chapters in the tutorial should
 automatically be built when Qt is compiled, or will be provided as
diff --git a/examples/tutorials/addressbook/README b/examples/tutorials/addressbook/README
index 9b7f908..20ae7f3 100644
--- a/examples/tutorials/addressbook/README
+++ b/examples/tutorials/addressbook/README
@@ -4,7 +4,7 @@ Qt documentation, which can be viewed using Qt Assistant or a Web browser.
 
 The tutorial is also available online at
 
-http://doc.trolltech.com/tutorial.html
+http://qt.nokia.com/doc/tutorial.html
 
 All programs corresponding to the chapters in the tutorial should
 automatically be built when Qt is compiled, or will be provided as
diff --git a/examples/widgets/stylesheet/mainwindow.cpp b/examples/widgets/stylesheet/mainwindow.cpp
index d699094..54f80c1 100644
--- a/examples/widgets/stylesheet/mainwindow.cpp
+++ b/examples/widgets/stylesheet/mainwindow.cpp
@@ -68,7 +68,7 @@ void MainWindow::on_aboutAction_triggered()
 {
     QMessageBox::about(this, tr("About Style sheet"),
         tr("The <b>Style Sheet</b> example shows how widgets can be styled "
-           "using <a href=\"http://doc.trolltech.com/4.5/stylesheet.html\">Qt "
+           "using <a href=\"http://qt.nokia.com/doc/4.5/stylesheet.html\">Qt "
            "Style Sheets</a>. Click <b>File|Edit Style Sheet</b> to pop up the "
            "style editor, and either choose an existing style sheet or design "
            "your own."));
diff --git a/examples/xml/dombookmarks/frank.xbel b/examples/xml/dombookmarks/frank.xbel
index 4dfaa4c..6bd63b8 100644
--- a/examples/xml/dombookmarks/frank.xbel
+++ b/examples/xml/dombookmarks/frank.xbel
@@ -71,13 +71,13 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://doc.trolltech.com/2.3/">
+            <bookmark href="http://qt.nokia.com/doc/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/3.3/">
+            <bookmark href="http://qt.nokia.com/doc/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/4.0/">
+            <bookmark href="http://qt.nokia.com/doc/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
             <bookmark href="http://qt.nokia.com/">
diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel
index dafdb67..6cfa491 100644
--- a/examples/xml/dombookmarks/jennifer.xbel
+++ b/examples/xml/dombookmarks/jennifer.xbel
@@ -45,13 +45,13 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://doc.trolltech.com/qq/">
+        <bookmark href="http://qt.nokia.com/doc/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/">
             <title>Qt home page</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/4.0/">
+        <bookmark href="http://qt.nokia.com/doc/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/developer/faqs/">
diff --git a/examples/xml/saxbookmarks/frank.xbel b/examples/xml/saxbookmarks/frank.xbel
index 4dfaa4c..6bd63b8 100644
--- a/examples/xml/saxbookmarks/frank.xbel
+++ b/examples/xml/saxbookmarks/frank.xbel
@@ -71,13 +71,13 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://doc.trolltech.com/2.3/">
+            <bookmark href="http://qt.nokia.com/doc/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/3.3/">
+            <bookmark href="http://qt.nokia.com/doc/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/4.0/">
+            <bookmark href="http://qt.nokia.com/doc/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
             <bookmark href="http://qt.nokia.com/">
diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel
index 51f0996..cd9bece 100644
--- a/examples/xml/saxbookmarks/jennifer.xbel
+++ b/examples/xml/saxbookmarks/jennifer.xbel
@@ -45,13 +45,13 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://doc.trolltech.com/qq/">
+        <bookmark href="http://qt.nokia.com/doc/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/">
             <title>qt home page</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/4.0/">
+        <bookmark href="http://qt.nokia.com/doc/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/developer/faqs/">
diff --git a/examples/xml/streambookmarks/frank.xbel b/examples/xml/streambookmarks/frank.xbel
index 4dfaa4c..6bd63b8 100644
--- a/examples/xml/streambookmarks/frank.xbel
+++ b/examples/xml/streambookmarks/frank.xbel
@@ -71,13 +71,13 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://doc.trolltech.com/2.3/">
+            <bookmark href="http://qt.nokia.com/doc/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/3.3/">
+            <bookmark href="http://qt.nokia.com/doc/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/4.0/">
+            <bookmark href="http://qt.nokia.com/doc/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
             <bookmark href="http://qt.nokia.com/">
diff --git a/examples/xml/streambookmarks/jennifer.xbel b/examples/xml/streambookmarks/jennifer.xbel
index ea75cbc..36256fd 100644
--- a/examples/xml/streambookmarks/jennifer.xbel
+++ b/examples/xml/streambookmarks/jennifer.xbel
@@ -45,13 +45,13 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://doc.trolltech.com/qq/">
+        <bookmark href="http://qt.nokia.com/doc/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/">
             <title>Qt home page</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/4.0/">
+        <bookmark href="http://qt.nokia.com/doc/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/developer/faqs/">
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp
index 80989ba..a2767e9 100644
--- a/src/gui/dialogs/qwizard.cpp
+++ b/src/gui/dialogs/qwizard.cpp
@@ -3388,7 +3388,7 @@ bool QWizardPage::validatePage()
     from the rest of your implementation, whenever the value of isComplete()
     changes. This ensures that QWizard updates the enabled or disabled state of
     its buttons. An example of the reimplementation is
-    available \l{http://doc.trolltech.com/qq/qq22-qwizard.html#validatebeforeitstoolate}
+    available \l{http://qt.nokia.com/doc/qq/qq22-qwizard.html#validatebeforeitstoolate}
     {here}. 
 
     \sa completeChanged(), isFinalPage()
diff --git a/src/gui/kernel/qlayoutitem.cpp b/src/gui/kernel/qlayoutitem.cpp
index 775f879..47fe5e6 100644
--- a/src/gui/kernel/qlayoutitem.cpp
+++ b/src/gui/kernel/qlayoutitem.cpp
@@ -108,7 +108,7 @@ QSizePolicy::operator QVariant() const
     be expressed using hasHeightForWidth(), heightForWidth(), and
     minimumHeightForWidth(). For more explanation see the \e{Qt
     Quarterly} article
-    \l{http://doc.trolltech.com/qq/qq04-height-for-width.html}{Trading
+    \l{http://qt.nokia.com/doc/qq/qq04-height-for-width.html}{Trading
     Height for Width}.
 
     \sa QLayout
diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp
index 9a9cfff..626bce2 100644
--- a/src/network/kernel/qurlinfo.cpp
+++ b/src/network/kernel/qurlinfo.cpp
@@ -215,7 +215,7 @@ QUrlInfo::QUrlInfo(const QUrl &url, int permissions, const QString &owner,
 
 /*!
     Sets the name of the URL to \a name. The name is the full text,
-    for example, "http://doc.trolltech.com/qurlinfo.html".
+    for example, "http://qt.nokia.com/doc/qurlinfo.html".
 
     If you call this function for an invalid URL info, this function
     turns it into a valid one.
diff --git a/src/qt3support/itemviews/q3iconview.cpp b/src/qt3support/itemviews/q3iconview.cpp
index f0cfe0b..8ad05fd 100644
--- a/src/qt3support/itemviews/q3iconview.cpp
+++ b/src/qt3support/itemviews/q3iconview.cpp
@@ -535,7 +535,7 @@ bool Q3IconDragData::operator==(const Q3IconDragData &i) const
 
     The data in Q3IconDragItems is stored in a QByteArray and is
     mime-typed (see QMimeSource and the
-    \link http://doc.trolltech.com/dnd.html Drag and Drop\endlink
+    \link http://qt.nokia.com/doc/dnd.html Drag and Drop\endlink
     overview). If you want to use your own mime-types derive a class
     from Q3IconDrag and reimplement format(), encodedData() and
     canDecode().
diff --git a/tests/auto/q3uridrag/tst_q3uridrag.cpp b/tests/auto/q3uridrag/tst_q3uridrag.cpp
index f38c75f..8df35f3 100644
--- a/tests/auto/q3uridrag/tst_q3uridrag.cpp
+++ b/tests/auto/q3uridrag/tst_q3uridrag.cpp
@@ -113,10 +113,10 @@ void tst_Q3UriDrag::decodeLocalFiles_data()
     
     QStringList mixOfLocalAndNonLocalFiles;
 #ifdef Q_WS_WIN
-    mixOfLocalAndNonLocalFiles << "http://www.trolltech.com" << "c:/main.cpp" << "ftp://doc.trolltech.com";
+    mixOfLocalAndNonLocalFiles << "http://www.trolltech.com" << "c:/main.cpp" << "ftp://qt.nokia.com/doc";
     QTest::newRow("mixOfLocalAndNonLocalFiles") << mixOfLocalAndNonLocalFiles << QStringList("c:/main.cpp");
 #else
-	mixOfLocalAndNonLocalFiles << "http://www.trolltech.com" << "/main.cpp" << "ftp://doc.trolltech.com";
+	mixOfLocalAndNonLocalFiles << "http://www.trolltech.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
     QTest::newRow("mixOfLocalAndNonLocalFiles") << mixOfLocalAndNonLocalFiles << QStringList("/main.cpp");
 #endif
 }
@@ -162,11 +162,11 @@ void tst_Q3UriDrag::decodeToUnicodeUris_data()
     QStringList mixOfLocalAndNonLocalUris;
 	QStringList mixOfLocalAndNonLocalUrisUU;
 #ifdef Q_WS_WIN
-    mixOfLocalAndNonLocalUris << "http://www.trolltech.com" << "c:/with space main.cpp" << "ftp://doc.trolltech.com";
-    mixOfLocalAndNonLocalUrisUU << "http://www.trolltech.com" << "c:/with space main.cpp" << "ftp://doc.trolltech.com";
+    mixOfLocalAndNonLocalUris << "http://www.trolltech.com" << "c:/with space main.cpp" << "ftp://qt.nokia.com/doc";
+    mixOfLocalAndNonLocalUrisUU << "http://www.trolltech.com" << "c:/with space main.cpp" << "ftp://qt.nokia.com/doc";
 #else
-	mixOfLocalAndNonLocalUris << "http://www.trolltech.com" << "/main.cpp" << "ftp://doc.trolltech.com";
-    mixOfLocalAndNonLocalUrisUU << "http://www.trolltech.com" << "/main.cpp" << "ftp://doc.trolltech.com";
+	mixOfLocalAndNonLocalUris << "http://www.trolltech.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
+    mixOfLocalAndNonLocalUrisUU << "http://www.trolltech.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
 #endif
 	QTest::newRow("mixOfLocalAndNonLocalUris") << mixOfLocalAndNonLocalUris << mixOfLocalAndNonLocalUrisUU;
 }
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp
index e996cb0..4fcf107 100644
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/qhttp/tst_qhttp.cpp
@@ -317,8 +317,8 @@ void tst_QHttp::get_data()
 	QTest::newRow( QString("failprot_02_%1").arg(i).toLatin1() ) << QtNetworkSettings::serverName() << 80u
 	    << QString("qtest/rfc3252.txt") << 1 << 400 << QByteArray() << (bool)(i==1);
 
-  // doc.trolltech.com uses transfer-encoding=chunked
-    /* doc.trolltech.com no longer seams to be using chuncked encodig.
+  // qt.nokia.com/doc uses transfer-encoding=chunked
+    /* qt.nokia.com/doc no longer seams to be using chuncked encodig.
     QTest::newRow( QString("chunked_01_%1").arg(i).toLatin1() ) << QString("test.troll.no") << 80u
 	    << QString("/") << 1 << 200 << trolltech << (bool)(i==1);
     */
@@ -415,8 +415,8 @@ void tst_QHttp::head_data()
     QTest::newRow( "failprot_02" ) << QtNetworkSettings::serverName() << 80u
 	<< QString("qtest/rfc3252.txt") << 1 << 400 << 0u;
 
-    /* doc.trolltech.com no longer seams to be using chuncked encodig.
-    QTest::newRow( "chunked_01" ) << QString("doc.trolltech.com") << 80u
+    /* qt.nokia.com/doc no longer seams to be using chuncked encodig.
+    QTest::newRow( "chunked_01" ) << QString("qt.nokia.com/doc") << 80u
 	<< QString("/index.html") << 1 << 200 << 0u;
     */
     QTest::newRow( "chunked_02" ) << QtNetworkSettings::serverName() << 80u
diff --git a/tools/assistant/tools/assistant/installdialog.cpp b/tools/assistant/tools/assistant/installdialog.cpp
index c1bb504..ae190e0 100644
--- a/tools/assistant/tools/assistant/installdialog.cpp
+++ b/tools/assistant/tools/assistant/installdialog.cpp
@@ -106,7 +106,7 @@ void InstallDialog::init()
     m_ui.statusLabel->setText(tr("Downloading documentation info..."));
     m_ui.progressBar->show();
     
-    QUrl url(QLatin1String("http://doc.trolltech.com/assistantdocs/docs.txt"));
+    QUrl url(QLatin1String("http://qt.nokia.com/doc/assistantdocs/docs.txt"));
     m_buffer = new QBuffer();
     m_buffer->open(QBuffer::ReadWrite);
 
@@ -214,7 +214,7 @@ void InstallDialog::downloadNextFile()
     m_ui.statusLabel->setText(tr("Downloading %1...").arg(fileName));
     m_ui.progressBar->show();
 
-    QLatin1String urlStr("http://doc.trolltech.com/assistantdocs/%1");
+    QLatin1String urlStr("http://qt.nokia.com/doc/assistantdocs/%1");
     QUrl url(QString(urlStr).arg(fileName));    
     
     m_httpAborted = false;
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index 66b206a..78a342d 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -115,4 +115,4 @@ lrelease gnomovision_*.ts
 .SH "SEE ALSO"
 .BR lupdate (1)
 and
-.BR http://doc.trolltech.com/i18n.html
+.BR http://qt.nokia.com/doc/i18n.html
diff --git a/tools/linguist/lupdate/lupdate.1 b/tools/linguist/lupdate/lupdate.1
index 58259eb..dfca4b3 100644
--- a/tools/linguist/lupdate/lupdate.1
+++ b/tools/linguist/lupdate/lupdate.1
@@ -150,4 +150,4 @@ lupdate *.cpp *.h *.ui -ts gnomovision_dk.ts
 .SH "SEE ALSO"
 .BR lrelease (1)
 and
-.BR http://doc.trolltech.com/i18n.html
+.BR http://qt.nokia.com/doc/i18n.html
diff --git a/tools/qdoc3/JAVATODO.txt b/tools/qdoc3/JAVATODO.txt
index 96df4c1..911b7a5 100644
--- a/tools/qdoc3/JAVATODO.txt
+++ b/tools/qdoc3/JAVATODO.txt
@@ -1,6 +1,6 @@
   * index page on "O" and downwards?
   * flag types, e.g. QTextStream::NumberFlags
-  * example references doc.trolltech.com etc.
+  * example references qt.nokia.com/doc etc.
 
   * fix enum value table (e.g. QCoreApplication.Encoding.html)
   * check reimplementation of interface functions (e.g. QWidget::widthMM())
diff --git a/util/qlalr/doc/qlalr.qdocconf b/util/qlalr/doc/qlalr.qdocconf
index 7e77374..391844b 100644
--- a/util/qlalr/doc/qlalr.qdocconf
+++ b/util/qlalr/doc/qlalr.qdocconf
@@ -2,7 +2,7 @@
 
 project                 = qlalr
 description             = qlalr Reference Documentation
-url                     = http://doc.trolltech.com/
+url                     = http://qt.nokia.com/doc/
 
 language                = Cpp