11 files changed, 23 insertions, 23 deletions
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]