15 files changed, 31 insertions, 31 deletions
diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini
index 8790e83ea9..9f8cd6c36e 100644
--- a/tools/installer/nsis/confirmpage.ini
+++ b/tools/installer/nsis/confirmpage.ini
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/gwdownload.ini b/tools/installer/nsis/gwdownload.ini
index 05c5952b1d..b71d8388ff 100644
--- a/tools/installer/nsis/gwdownload.ini
+++ b/tools/installer/nsis/gwdownload.ini
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/gwmirror.ini b/tools/installer/nsis/gwmirror.ini
index 9525164992..42dec9094d 100644
--- a/tools/installer/nsis/gwmirror.ini
+++ b/tools/installer/nsis/gwmirror.ini
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/includes/global.nsh b/tools/installer/nsis/includes/global.nsh
index c12401801c..861a187a6b 100644
--- a/tools/installer/nsis/includes/global.nsh
+++ b/tools/installer/nsis/includes/global.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/includes/instdir.nsh b/tools/installer/nsis/includes/instdir.nsh
index 859b004e06..1334a01574 100644
--- a/tools/installer/nsis/includes/instdir.nsh
+++ b/tools/installer/nsis/includes/instdir.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/includes/list.nsh b/tools/installer/nsis/includes/list.nsh
index c553f67e67..5cea6503cf 100644
--- a/tools/installer/nsis/includes/list.nsh
+++ b/tools/installer/nsis/includes/list.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index 72a52118db..5b37918fcb 100644
--- a/tools/installer/nsis/includes/qtcommon.nsh
+++ b/tools/installer/nsis/includes/qtcommon.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/includes/qtenv.nsh b/tools/installer/nsis/includes/qtenv.nsh
index 9232093797..23f99cfdff 100644
--- a/tools/installer/nsis/includes/qtenv.nsh
+++ b/tools/installer/nsis/includes/qtenv.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/includes/system.nsh b/tools/installer/nsis/includes/system.nsh
index f7cbec4ac9..ac7f75576e 100644
--- a/tools/installer/nsis/includes/system.nsh
+++ b/tools/installer/nsis/includes/system.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/installer.nsi b/tools/installer/nsis/installer.nsi
index c077850cc7..35a72ad46a 100644
--- a/tools/installer/nsis/installer.nsi
+++ b/tools/installer/nsis/installer.nsi
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/modules/environment.nsh b/tools/installer/nsis/modules/environment.nsh
index 0f6013bc70..217ebc73e2 100644
--- a/tools/installer/nsis/modules/environment.nsh
+++ b/tools/installer/nsis/modules/environment.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh
index 84851781e7..5503da71ec 100644
--- a/tools/installer/nsis/modules/mingw.nsh
+++ b/tools/installer/nsis/modules/mingw.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/modules/opensource.nsh b/tools/installer/nsis/modules/opensource.nsh
index 3657ba8796..572991d5e0 100644
--- a/tools/installer/nsis/modules/opensource.nsh
+++ b/tools/installer/nsis/modules/opensource.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/modules/registeruiext.nsh b/tools/installer/nsis/modules/registeruiext.nsh
index a335097bee..26b88a8d2f 100644
--- a/tools/installer/nsis/modules/registeruiext.nsh
+++ b/tools/installer/nsis/modules/registeruiext.nsh
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini
index 334dc5d146..b7affdbc71 100644
--- a/tools/installer/nsis/opensource.ini
+++ b/tools/installer/nsis/opensource.ini
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; Contact: Qt Software Information (qt-info@nokia.com)
+;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
 ;;
@@ -34,7 +34,7 @@
 ;; met: http://www.gnu.org/copyleft/gpl.html.
 ;;
 ;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at qt-sales@nokia.com.
+;; contact the sales department at http://www.qtsoftware.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -73,7 +73,7 @@ Bottom=120
 
 [Field 4]
 Type=Label
-Text=To read more about Nokia/Qt Software's licensing, please go to:
+Text=To read more about Nokia's licensing, please go to:
 Left=0
 Right=278
 Top=97