15 files changed, 195 insertions, 195 deletions
diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini
index d1c51ef..00df3ec 100644
--- a/tools/installer/nsis/confirmpage.ini
+++ b/tools/installer/nsis/confirmpage.ini
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 0374642..42351d1 100644
--- a/tools/installer/nsis/gwdownload.ini
+++ b/tools/installer/nsis/gwdownload.ini
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 4b7fb74..2757177 100644
--- a/tools/installer/nsis/gwmirror.ini
+++ b/tools/installer/nsis/gwmirror.ini
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 322d2ac..7905040 100644
--- a/tools/installer/nsis/includes/global.nsh
+++ b/tools/installer/nsis/includes/global.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 95cc702..0a3bde7 100644
--- a/tools/installer/nsis/includes/instdir.nsh
+++ b/tools/installer/nsis/includes/instdir.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 95a52d3..cfaeb79 100644
--- a/tools/installer/nsis/includes/list.nsh
+++ b/tools/installer/nsis/includes/list.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 9c0756a..986ca64 100644
--- a/tools/installer/nsis/includes/qtcommon.nsh
+++ b/tools/installer/nsis/includes/qtcommon.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 a14a64d..552cae9 100644
--- a/tools/installer/nsis/includes/qtenv.nsh
+++ b/tools/installer/nsis/includes/qtenv.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 6d41948..8b0b4b9 100644
--- a/tools/installer/nsis/includes/system.nsh
+++ b/tools/installer/nsis/includes/system.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 a079f2c..d870a57 100644
--- a/tools/installer/nsis/installer.nsi
+++ b/tools/installer/nsis/installer.nsi
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 7b6c5af..bedf2d0 100644
--- a/tools/installer/nsis/modules/environment.nsh
+++ b/tools/installer/nsis/modules/environment.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 d294cb8..3e40fe2 100644
--- a/tools/installer/nsis/modules/mingw.nsh
+++ b/tools/installer/nsis/modules/mingw.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 2a3b4e4..26dcc1d 100644
--- a/tools/installer/nsis/modules/opensource.nsh
+++ b/tools/installer/nsis/modules/opensource.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 429e14a..b7a3ee6 100644
--- a/tools/installer/nsis/modules/registeruiext.nsh
+++ b/tools/installer/nsis/modules/registeruiext.nsh
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.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 6b4f4be..53f47af 100644
--- a/tools/installer/nsis/opensource.ini
+++ b/tools/installer/nsis/opensource.ini
@@ -9,8 +9,8 @@
 ;; No Commercial Usage
 ;; This file contains pre-release code and may not be distributed.
 ;; You may use this file in accordance with the terms and conditions
-;; contained in the either Technology Preview License Agreement or the
-;; Beta Release License Agreement.
+;; contained in the Technology Preview License Agreement accompanying
+;; this package.
 ;;
 ;; GNU Lesser General Public License Usage
 ;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 ;;
 ;; In addition, as a special exception, Nokia gives you certain
-;; additional rights. These rights are described in the Nokia Qt LGPL
-;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+;; additional rights.  These rights are described in the Nokia Qt LGPL
+;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
 ;; package.
 ;;
-;; GNU General Public License Usage
-;; Alternatively, this file may be used under the terms of the GNU
-;; General Public License version 3.0 as published by the Free Software
-;; Foundation and appearing in the file LICENSE.GPL included in the
-;; packaging of this file.  Please review the following information to
-;; ensure the GNU General Public License version 3.0 requirements will be
-;; met: http://www.gnu.org/copyleft/gpl.html.
+;; If you have questions regarding the use of this file, please contact
+;; Nokia at qt-info@nokia.com.
+;;
+;;
+;;
+;;
+;;
+;;
+;;
 ;;
-;; If you are unsure which license is appropriate for your use, please
-;; contact the sales department at http://qt.nokia.com/contact.
 ;; $QT_END_LICENSE$
 ;;
 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE