Qt's domain name is now qt.nokia.com.

Reviewed-by: Trust Me

7 files changed, 13 insertions, 13 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..8bb218e 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/products/qt"><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..65fe666 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/qt/licenses\">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..45d1744 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/developer/downloads/qt
+State=http://qt.nokia.com/developer/downloads/qt
 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/company/model
+State=http://qt.nokia.com/company/model
 Left=0
 Right=267
 Top=112
diff --git a/tools/linguist/phrasebooks/polish.qph b/tools/linguist/phrasebooks/polish.qph
index 1553696..928ffd8 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/company/model.html&quot;&gt;qt.nokia.com/company/model.html&lt;/a&gt; dla poznania sposobu licencjonowania Qt.</target>
 </phrase>
 <phrase>
     <source>Zoom in</source>
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>