Update URL's to use new domain.

Reviewed-by: Trust Me

19 files changed, 27 insertions, 27 deletions

diff --git a/tools/designer/src/lib/shared/textpropertyeditor.cpp b/tools/designer/src/lib/shared/textpropertyeditor.cpp
index 40165f4..07d578e 100644
--- a/tools/designer/src/lib/shared/textpropertyeditor.cpp
+++ b/tools/designer/src/lib/shared/textpropertyeditor.cpp
@@ -278,7 +278,7 @@ namespace qdesigner_internal {
                 urlCompletions.push_back(QLatin1String("about:blank"));
                 urlCompletions.push_back(QLatin1String("http://"));
                 urlCompletions.push_back(QLatin1String("http://www."));
-                urlCompletions.push_back(QLatin1String("http://qtsoftware.com/"));
+                urlCompletions.push_back(QLatin1String("http://qt.nokia.com/"));
                 urlCompletions.push_back(QLatin1String("file://"));
                 urlCompletions.push_back(QLatin1String("ftp://"));
                 urlCompletions.push_back(QLatin1String("data:"));
diff --git a/tools/doxygen/config/header.html b/tools/doxygen/config/header.html
index a445b2a..504d4f7 100644
--- a/tools/doxygen/config/header.html
+++ b/tools/doxygen/config/header.html
@@ -10,7 +10,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
 <tr>
 <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>
 <td width="1">&nbsp;&nbsp;</td>
 <td class="postheader" valign="center">
@@ -27,4 +27,4 @@
  <a href="functions.html">
 <font color="#004faf">Functions</font></a>
 </td>
-<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>
diff --git a/tools/doxygen/config/phonon.doxyfile b/tools/doxygen/config/phonon.doxyfile
index a190cfa..a43007d 100644
--- a/tools/doxygen/config/phonon.doxyfile
+++ b/tools/doxygen/config/phonon.doxyfile
@@ -216,5 +216,5 @@ ALIASES = \
         "x11=<a href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3\">X11</a>" \
         "gpl=<a href=\"http://www.fsf.org/licensing/licenses/gpl.html#SEC1\">GPL</a>" \
         "lgpl=<a href=\"http://www.fsf.org/licensing/licenses/lgpl.html#SEC1\">LGPL</a>" \
-        "qpl=<a href=\"http://qtsoftware.com/products/qt/licenses\">QPL</a>"
+        "qpl=<a href=\"http://qt.nokia.com/products/licensing\">QPL</a>"
 
diff --git a/tools/installer/nsis/installer.nsi b/tools/installer/nsis/installer.nsi
index 72eceb4..a079f2c 100644
--- a/tools/installer/nsis/installer.nsi
+++ b/tools/installer/nsis/installer.nsi
@@ -47,7 +47,7 @@
 !include "includes\global.nsh"
 
 !define PRODUCT_PUBLISHER "Nokia Corporation and/or its subsidiary(-ies)"
-!define PRODUCT_WEB_SITE "http://qtsoftware.com"
+!define PRODUCT_WEB_SITE "http://qt.nokia.com"
 
 !define INSTALL_ICON "images\install.ico"
 !define WELCOME_PAGE_ICON "images\qt-wizard.bmp"
@@ -214,7 +214,7 @@ Section -CommonSection
   WriteRegStr SHCTX "$PRODUCT_UNIQUE_KEY" "Publisher" "${PRODUCT_PUBLISHER}"
 
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_STRING\QtSoftware.com.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\$STARTMENU_STRING\qt.nokia.com.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_STRING\Uninstall ${PRODUCT_NAME} ${PRODUCT_VERSION}.lnk" "$INSTDIR\uninst.exe"
   SetOutPath "$INSTDIR"
 SectionEnd
@@ -405,7 +405,7 @@ Section Uninstall
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
   Delete "$INSTDIR\uninst.exe"
   Delete "$SMPROGRAMS\$STARTMENU_STRING\Uninstall ${PRODUCT_NAME} ${PRODUCT_VERSION}.lnk"
-  Delete "$SMPROGRAMS\$STARTMENU_STRING\QtSoftware.com.lnk"
+  Delete "$SMPROGRAMS\$STARTMENU_STRING\qt.nokia.com.lnk"
 
   RMDir "$SMPROGRAMS\$STARTMENU_STRING"
   RMDir "$INSTDIR"
diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini
index 58982d2..6b4f4be 100644
--- a/tools/installer/nsis/opensource.ini
+++ b/tools/installer/nsis/opensource.ini
@@ -55,8 +55,8 @@ Bottom=78
 
 [Field 2]
 Type=Link
-Text=http://qtsoftware.com/developer/downloads/qt
-State=http://qtsoftware.com/developer/downloads/qt
+Text=http://qt.nokia.com/downloads
+State=http://qt.nokia.com/downloads
 Left=0
 Right=278
 Top=80
@@ -64,8 +64,8 @@ Bottom=88
 
 [Field 3]
 Type=Link
-Text=http://qtsoftware.com/company/model
-State=http://qtsoftware.com/company/model
+Text=http://qt.nokia.com/about
+State=http://qt.nokia.com/about
 Left=0
 Right=267
 Top=112
diff --git a/tools/linguist/phrasebooks/polish.qph b/tools/linguist/phrasebooks/polish.qph
index 1553696..9cedaec 100644
--- a/tools/linguist/phrasebooks/polish.qph
+++ b/tools/linguist/phrasebooks/polish.qph
@@ -514,7 +514,7 @@
 </phrase>
 <phrase>
     <source>You need a commercial</source>
-    <target>Aby móc sprzedawać aplikację utworzone przy pomocy Qt potrzebujesz wersji komercyjnej. Proszę sprawdzić &lt;a href=&quot;http://qtsoftware.com/company/model.html&quot;&gt;qtsoftware.com/company/model.html&lt;/a&gt; dla poznania sposobu licencjonowania Qt.</target>
+    <target>Aby móc sprzedawać aplikację utworzone przy pomocy Qt potrzebujesz wersji komercyjnej. Proszę sprawdzić &lt;a href=&quot;http://qt.nokia.com/about&quot;&gt;qt.nokia.com/about&lt;/a&gt; dla poznania sposobu licencjonowania Qt.</target>
 </phrase>
 <phrase>
     <source>Zoom in</source>
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 44815ff..9ee8965 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.6
+url                     = http://qt.nokia.com/doc/4.6
 
 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 aee5e17..faac174 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 88f8dc9..2a65184 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.6
+url                     = http://qt.nokia.com/doc/4.6
 
 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 d9e4ac7..aadaae6 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 101b33a..d000669 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 1c0a585..6c71993 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.6
+url                     = http://qt.nokia.com/doc/4.6
 
 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 0f98132..3dc1d3b 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.6
+url                     = http://qt.nokia.com/doc/4.6
 
 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 b4f0c7a..70e3b4f 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.6
+url                     = http://qt.nokia.com/doc/4.6
 
 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 dc027d0..e4e60dc 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 379511f..4ef32b8 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.6
+url                     = http://qt.nokia.com/doc/4.6
 
 edition.Console         = QtCore QtNetwork QtSql QtXml QtScript QtTest
 edition.Desktop         = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \
@@ -122,7 +122,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\">" \
@@ -139,7 +139,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 10e0fcd..942d023 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.6
+url                     = http://qt.nokia.com/doc/4.6
 
 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 3a22886..d61db54 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>"
diff --git a/tools/qtconfig/previewwidgetbase.ui b/tools/qtconfig/previewwidgetbase.ui
index 2a9e17e..c113af8 100644
--- a/tools/qtconfig/previewwidgetbase.ui
+++ b/tools/qtconfig/previewwidgetbase.ui
@@ -306,7 +306,7 @@
                   </property>
                   <property name="text" >
                     <string>&lt;p>
-&lt;a href=&quot;http://qtsoftware.com&quot;>http://qtsoftware.com&lt;/a>
+&lt;a href=&quot;http://qt.nokia.com&quot;>http://qt.nokia.com&lt;/a>
 &lt;/p>
 &lt;p>
 &lt;a href=&quot;http://www.kde.org&quot;>http://www.kde.org&lt;/a>