Update URL of online documentation.

Reviewed-by: Trust Me

14 files changed, 30 insertions, 30 deletions

diff --git a/doc/src/distributingqt.qdoc b/doc/src/distributingqt.qdoc
index 1b2023f6b5..0739976642 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 95091c0783..a67e523e71 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 0120c0dd09..490e22cf50 100644
--- a/doc/src/examples-overview.qdoc
+++ b/doc/src/examples-overview.qdoc
@@ -339,10 +339,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 612ced0be3..ee235093cb 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 769c08d59d..b45a5832e9 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 04fb4d0784..97984045a3 100644
--- a/doc/src/layout.qdoc
+++ b/doc/src/layout.qdoc
@@ -244,7 +244,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 5b6fad7dea..50c018810d 100644
--- a/doc/src/linguist-manual.qdoc
+++ b/doc/src/linguist-manual.qdoc
@@ -1415,8 +1415,8 @@
     \c -pluralonly command line option, which allows the creation of
     \c .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 9584a7bb6e..ca1aa36554 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:
 
@@ -1065,7 +1065,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.)
 
@@ -2425,13 +2425,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
@@ -3244,7 +3244,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}{Unblocking Networking}),
+    \l{http://qt.nokia.com/doc/qq/qq09-networkthread.html}{Unblocking Networking}),
     you can now use QTcpSocket, QFtp, or QHttp instead, which can now be used from
     non-GUI threads.
 
@@ -4039,7 +4039,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()
@@ -4137,7 +4137,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/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 83a2d9d11c..822f8f8bd9 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -2525,7 +2525,7 @@
     "\l{http://qt.nokia.com/careers/movingto/brisbane/}{http://qt.nok...ovingto/brisbane/}"),
     whereas Qt::ElideRight is appropriate
     for other strings (e.g.,
-    "\l{http://doc.trolltech.com/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}").
+    "\l{http://qt.nokia.com/doc/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}").
 
     \sa QAbstractItemView::textElideMode, QFontMetrics::elidedText(), AlignmentFlag QTabBar::elideMode
 */
diff --git a/doc/src/resources.qdoc b/doc/src/resources.qdoc
index 17335c0a89..9a4f1b301b 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 50a41248c2..622295d48b 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 189d271edd..390444b94a 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/doc/src/tech-preview/known-issues.html b/doc/src/tech-preview/known-issues.html
index 400f3f0620..bf0b7f388b 100644
--- a/doc/src/tech-preview/known-issues.html
+++ b/doc/src/tech-preview/known-issues.html
@@ -12,7 +12,7 @@
 <body bgcolor="#ffffff">
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr bgcolor="#E5E5E5">
-        <td><img src="http://doc.trolltech.com/doctitle.png" width="443" height="32" border="0"></td>
+        <td><img src="http://qt.nokia.com/doc/doctitle.png" width="443" height="32" border="0"></td>
         <td align="right" valign="middle"></td></tr></table>
 <h1>Known Issues: Qt 4.0.0 Technology Preview 1</h1>
 <p>
diff --git a/doc/src/trolltech-webpages.qdoc b/doc/src/trolltech-webpages.qdoc
index d4ea089331..5b330e3cb6 100644
--- a/doc/src/trolltech-webpages.qdoc
+++ b/doc/src/trolltech-webpages.qdoc
@@ -150,7 +150,7 @@
 */
 
 /*!
-    \externalpage http://doc.trolltech.com/supported-platforms.html
+    \externalpage http://qt.nokia.com/doc/supported-platforms.html
     \title Platform Support Policy
 */
 
@@ -160,7 +160,7 @@
 */
 
 /*!
-    \externalpage http://doc.trolltech.com/supported-platforms.html
+    \externalpage http://qt.nokia.com/doc/supported-platforms.html
     \title Qt 4 Platforms Overview
 */
 
@@ -170,7 +170,7 @@
 */
 
 /*!
-    \externalpage http://doc.trolltech.com/qq/
+    \externalpage http://qt.nokia.com/doc/qq/
     \title Qt Quarterly
 */
 
@@ -190,7 +190,7 @@
 */
 
 /*!
-    \externalpage http://doc.trolltech.com/qtcanvas
+    \externalpage http://qt.nokia.com/doc/qtcanvas
     \title QtCanvas
 */
 
@@ -225,7 +225,7 @@
 */
 
 /*!
-    \externalpage http://doc.trolltech.com/qq/qq21-portingcanvas.html
+    \externalpage http://qt.nokia.com/doc/qq/qq21-portingcanvas.html
     \title Porting to Qt 4.2's Graphics View
 */