4 files changed, 16 insertions, 20 deletions
diff --git a/tools/installer/nsis/modules/environment.nsh b/tools/installer/nsis/modules/environment.nsh
index 889cc42..b661983 100644
--- a/tools/installer/nsis/modules/environment.nsh
+++ b/tools/installer/nsis/modules/environment.nsh
@@ -1,7 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; All rights reserved.
 ;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
@@ -21,9 +20,10 @@
 ;; ensure the GNU Lesser General Public License version 2.1 requirements
 ;; 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+;; In addition, as a special exception, Nokia gives you certain
+;; 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.
 ;;
 ;; If you have questions regarding the use of this file, please contact
 ;; Nokia at qt-info@nokia.com.
diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh
index 804c6a5..c3cc236 100644
--- a/tools/installer/nsis/modules/mingw.nsh
+++ b/tools/installer/nsis/modules/mingw.nsh
@@ -1,7 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; All rights reserved.
 ;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
@@ -21,9 +20,10 @@
 ;; ensure the GNU Lesser General Public License version 2.1 requirements
 ;; 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+;; In addition, as a special exception, Nokia gives you certain
+;; 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.
 ;;
 ;; If you have questions regarding the use of this file, please contact
 ;; Nokia at qt-info@nokia.com.
@@ -104,9 +104,6 @@ Section "${MODULE_MINGW_NAME} ${MODULE_MINGW_VERSION}" MINGW_SEC01
   SetOverwrite ifnewer
   !insertmacro MODULE_MINGW_INSTALLFILES
   
-  push "$MINGW_INSTDIR"
-  call DeleteFloatingLicenseProgram
-
   push "$MINGW_INSTDIR\bin"
   call AddStartmenuApplication
   
diff --git a/tools/installer/nsis/modules/opensource.nsh b/tools/installer/nsis/modules/opensource.nsh
index 0bc83b1..5638fb0 100644
--- a/tools/installer/nsis/modules/opensource.nsh
+++ b/tools/installer/nsis/modules/opensource.nsh
@@ -1,7 +1,5 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; All rights reserved.
 ;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
@@ -21,9 +19,10 @@
 ;; ensure the GNU Lesser General Public License version 2.1 requirements
 ;; 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+;; In addition, as a special exception, Nokia gives you certain
+;; 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.
 ;;
 ;; If you have questions regarding the use of this file, please contact
 ;; Nokia at qt-info@nokia.com.
diff --git a/tools/installer/nsis/modules/registeruiext.nsh b/tools/installer/nsis/modules/registeruiext.nsh
index 706a2ce..2602187 100644
--- a/tools/installer/nsis/modules/registeruiext.nsh
+++ b/tools/installer/nsis/modules/registeruiext.nsh
@@ -1,7 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-;; All rights reserved.
 ;; Contact: Nokia Corporation (qt-info@nokia.com)
 ;;
 ;; This file is part of the tools applications of the Qt Toolkit.
@@ -21,9 +20,10 @@
 ;; ensure the GNU Lesser General Public License version 2.1 requirements
 ;; 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+;; In addition, as a special exception, Nokia gives you certain
+;; 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.
 ;;
 ;; If you have questions regarding the use of this file, please contact
 ;; Nokia at qt-info@nokia.com.