Doc: Our webdomain has changed.

13 files changed, 51 insertions, 51 deletions

diff --git a/doc/src/trolltech-webpages.qdoc b/doc/src/trolltech-webpages.qdoc
index 7d48167c4..cc6e4b838 100644
--- a/doc/src/trolltech-webpages.qdoc
+++ b/doc/src/trolltech-webpages.qdoc
@@ -40,137 +40,132 @@
 ****************************************************************************/
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt
+    \externalpage http://qt.nokia.com/
     \title Qt website
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/bugreport-form
+    \externalpage http://qt.nokia.com/bugreport-form
     \title Bug Report Form
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/add-on-products/add-on-products/
+    \externalpage http://qt.nokia.com/products/add-on-products/add-on-products/
     \title Third-Party Tools
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/add-on-products
+    \externalpage http://qt.nokia.com/products/add-on-products
     \title Qt Solutions
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/documentation/books
+    \externalpage http://qt.nokia.com/developer/books
     \title Books about Qt Programming
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt/qt3/book
+    \externalpage http://qt.nokia.com/developer/books/3
     \title GUI Programming with Qt 3
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt/
+    \externalpage http://qt.nokia.com/
     \title Qt Homepage
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt
+    \externalpage http://qt.nokia.com/about
     \title About Qt
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt/indepth/vs-integration
+    \externalpage http://qt.nokia.com/products/developer-tools
     \title Visual Studio Integration
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtcalendarwidget/
+    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtcalendarwidget/
     \title Calendar Widget
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtwizard/
+    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtwizard/
     \title QtWizard
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Utilities/qtcorba/
+    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Utilities/qtcorba/
     \title CORBA Framework
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtwindowlistmenu/
+    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtwindowlistmenu/
     \title Window Menu
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/customers/casestories
+    \externalpage http://qt.nokia.com/qt-in-use
     \title Customer Success Stories
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer
+    \externalpage http://qt.nokia.com/developer
     \title Developer Zone
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/downloads
+    \externalpage http://qt.nokia.com/downloads
     \title Downloads
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/faqs/
+    \externalpage http://qt.nokia.com/developer/faqs/
     \title FAQs
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/faqs/licensing
+    \externalpage http://qt.nokia.com/developer/faqs/licensing
     \title License FAQ
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/downloads/freesoftware
+    \externalpage http://qt.nokia.com/products/licensing
     \title Free Software and Contributions
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt/licenses/licensing/
+    \externalpage http://qt.nokia.com/products/licensing
     \title Qt Licensing Overview
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt/licenses/pricing/
+    \externalpage http://qt.nokia.com/products/pricing/
     \title Qt License Pricing
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt/orderform
+    \externalpage http://qt.nokia.com/contact
     \title How to Order
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/support-services/support/platform-support-policy
+    \externalpage http://doc.trolltech.com/supported-platforms.html
     \title Platform Support Policy
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/
+    \externalpage http://qt.nokia.com/products/
     \title Product Overview
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/
+    \externalpage http://doc.trolltech.com/supported-platforms.html
     \title Qt 4 Platforms Overview
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/
-    \title Qt 4 Supported Platforms
-*/
-
-/*!
-    \externalpage http://www.qtsoftware.com/products/qtopia/
+    \externalpage http://qt.nokia.com/products/qtopia/
     \title Qt Extended
 */
 
@@ -180,7 +175,7 @@
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/task-tracker
+    \externalpage http://qt.nokia.com/developer/task-tracker
     \title Task Tracker
 */
 
@@ -190,7 +185,7 @@
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/qt/learnmore/whitepapers
+    \externalpage http://qt.nokia.com/products/files/pdf/
     \title Whitepapers
 */
 
@@ -220,12 +215,12 @@
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/downloads/qt/qsa
+    \externalpage http://qt.nokia.com/products/library/modular-class-library#info_scripting
     \title Qt Script for Applications (QSA)
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/
+    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/
     \title QtSharedMemory
 */
 
@@ -235,11 +230,16 @@
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Windows/qtwinforms/
+    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Windows/qtwinforms/
     \title QtWinForms Solution
 */
 
 /*!
-    \externalpage http://www.qtsoftware.com/developer/faqs/qt/installation
+    \externalpage http://qt.nokia.com/developer/faqs/qt/installation
     \title Installation FAQ
 */
+
+/*!
+    \externalpage http://qt.gitorious.org
+    \title Public Qt Repository
+*/
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 71de9981c..0a4cef835 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Assistant
 description             = Qt Assistant Manual
-url                     = http://doc.qtsoftware.com/4.5
+url                     = http://qt.nokia.com/doc/4.5
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
diff --git a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf
index aee5e1769..faac17472 100644
--- a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf
+++ b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf
@@ -7,6 +7,6 @@ macro.TheEclipseIntegration = Carbide.c++
 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
               "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
-              "<td width=\"40%\" align=\"center\"><a href=\"http://doc.qtsoftware.com\">Trademarks</a></td>\n" \
+              "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc\">Trademarks</a></td>\n" \
               "<td width=\"30%\" align=\"right\"><div align=\"right\">Carbide.c++</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 0c39bb8ec..acae04732 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Designer
 description             = Qt Designer Manual
-url                     = http://doc.qtsoftware.com/4.5
+url                     = http://qt.nokia.com/doc/4.5
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
diff --git a/tools/qdoc3/test/eclipse-integration.qdocconf b/tools/qdoc3/test/eclipse-integration.qdocconf
index d9e4ac78b..aadaae641 100644
--- a/tools/qdoc3/test/eclipse-integration.qdocconf
+++ b/tools/qdoc3/test/eclipse-integration.qdocconf
@@ -8,6 +8,6 @@ outputdir = $QTDIR/../qteclipsetools/main/doc/html
 
 project               = Qt Eclipse Integration
 description           = "Qt Eclipse Integration"
-url                   = http://doc.qtsoftware.com/qt-eclipse-1.5
+url                   = http://qt.nokia.com/doc/qt-eclipse-1.5
 
 HTML.{postheader,address} = ""
diff --git a/tools/qdoc3/test/jambi.qdocconf b/tools/qdoc3/test/jambi.qdocconf
index 101b33a9b..d000669a9 100644
--- a/tools/qdoc3/test/jambi.qdocconf
+++ b/tools/qdoc3/test/jambi.qdocconf
@@ -3,7 +3,7 @@ include(macros.qdocconf)
 
 project                 = Qt Jambi
 description             = Qt Jambi Reference Documentation
-url                     = http://doc.qtsoftware.com/qtjambi
+url                     = http://qt.nokia.com/doc/qtjambi
 
 version                 = 4.4.0_01
 
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index b6bd37563..39d614bee 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Linguist
 description             = Qt Linguist Manual
-url                     = http://doc.qtsoftware.com/4.5
+url                     = http://qt.nokia.com/doc/4.5
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index 83220ae8b..91b0b1be9 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = QMake
 description             = QMake Manual
-url                     = http://doc.qtsoftware.com/4.5
+url                     = http://qt.nokia.com/doc/4.5
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 5169714cb..a8315aaaa 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qt
 description             = Qt Reference Documentation
-url                     = http://doc.qtsoftware.com/4.5
+url                     = http://qt.nokia.com/doc/4.5
 
 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
                           QtXmlPatterns QtTest
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index dc027d0bc..e4e60dc97 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -2,7 +2,7 @@ HTML.stylesheets        = classic.css
 HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
                           "<tr>\n" \
                           "<td align=\"left\" valign=\"top\" width=\"32\">" \
-                          "<a href=\"http://qtsoftware.com/products/qt\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
+                          "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
                           "</td>\n" \
                           "<td width=\"1\">&nbsp;&nbsp;</td>" \
                           "<td class=\"postheader\" valign=\"center\">" \
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
index d6cb0e62d..86cd3fdfd 100644
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ b/tools/qdoc3/test/qt-inc.qdocconf
@@ -3,7 +3,7 @@ include(macros.qdocconf)
 
 project                 = Qt
 description             = Qt Reference Documentation
-url                     = http://doc.qtsoftware.com/4.5
+url                     = http://qt.nokia.com/doc/4.5
 
 edition.Console         = QtCore QtNetwork QtSql QtXml QtScript QtTest
 edition.Desktop         = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \
@@ -120,7 +120,7 @@ HTML.stylesheets        = $QTDIR/util/qdoc3/test/classic.css
 HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
                           "<tr>\n" \
                           "<td align=\"left\" valign=\"top\" width=\"32\">" \
-                          "<a href=\"http://qtsoftware.com/products/qt\"><img src=\"images/qt-logo.png\" align=\"left\" width=\"32\" height=\"32\" border=\"0\" /></a>" \
+                          "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" width=\"32\" height=\"32\" border=\"0\" /></a>" \
                           "</td>\n" \
                           "<td width=\"1\">&nbsp;&nbsp;</td>" \
                           "<td class=\"postheader\" valign=\"center\">" \
@@ -137,7 +137,7 @@ HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
                           " <a href=\"functions.html\">" \
                           "<font color=\"#004faf\">Functions</font></a>" \
                           "</td>\n" \
-                          "<td align=\"right\" valign=\"top\" width=\"230\"><a href=\"http://qtsoftware.com\"><img src=\"images/trolltech-logo.png\" align=\"right\" width=\"203\" height=\"32\" border=\"0\" /></a></td></tr></table>"
+                          "<td align=\"right\" valign=\"top\" width=\"230\"><a href=\"http://qt.nokia.com/\"><img src=\"images/trolltech-logo.png\" align=\"right\" width=\"203\" height=\"32\" border=\"0\" /></a></td></tr></table>"
 
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index f1fd8a2d6..b541db408 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -8,7 +8,7 @@ project                 = Qt
 versionsym              =
 version                 = %VERSION%
 description             = Qt Reference Documentation
-url                     = http://doc.qtsoftware.com/4.5
+url                     = http://qt.nokia.com/doc/4.5
 
 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
                           QtXmlPatterns QtTest
diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
index 3a2288666..d61db54c3 100644
--- a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
+++ b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
@@ -6,6 +6,6 @@ macro.TheEclipseIntegration = The Qt Eclipse Integration
 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
               "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
-              "<td width=\"40%\" align=\"center\"><a href=\"http://doc.qtsoftware.com/trademarks.html\">Trademarks</a></td>\n" \
+              "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc/trademarks.html\">Trademarks</a></td>\n" \
               "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.2</div></td>\n" \
               "</tr></table></div></address>"