summaryrefslogtreecommitdiffstats
path: root/tools/installer
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-09-09 04:29:13 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-09-09 04:29:13 (GMT)
commit04e3b306115b1a4631032e3ce5b79cc78145365b (patch)
treec7bf7f282d4dcfe11fbdd0a7c5de686d2c4f36ab /tools/installer
parent9fc309a822490ba93c4c7a1fa1221b288e145a3d (diff)
downloadQt-04e3b306115b1a4631032e3ce5b79cc78145365b.zip
Qt-04e3b306115b1a4631032e3ce5b79cc78145365b.tar.gz
Qt-04e3b306115b1a4631032e3ce5b79cc78145365b.tar.bz2
Update license headers again.
Reviewed-by: Trust Me
Diffstat (limited to 'tools/installer')
-rwxr-xr-xtools/installer/batch/build.bat8
-rwxr-xr-xtools/installer/batch/copy.bat8
-rwxr-xr-xtools/installer/batch/delete.bat8
-rwxr-xr-xtools/installer/batch/env.bat8
-rwxr-xr-xtools/installer/batch/extract.bat8
-rwxr-xr-xtools/installer/batch/installer.bat8
-rwxr-xr-xtools/installer/batch/log.bat8
-rwxr-xr-xtools/installer/batch/toupper.bat8
-rw-r--r--tools/installer/config/config.default.sample8
-rw-r--r--tools/installer/config/mingw-opensource.conf8
-rwxr-xr-xtools/installer/iwmake.bat8
-rw-r--r--tools/installer/nsis/confirmpage.ini8
-rw-r--r--tools/installer/nsis/gwdownload.ini8
-rw-r--r--tools/installer/nsis/gwmirror.ini8
-rw-r--r--tools/installer/nsis/includes/global.nsh8
-rw-r--r--tools/installer/nsis/includes/instdir.nsh8
-rw-r--r--tools/installer/nsis/includes/list.nsh8
-rw-r--r--tools/installer/nsis/includes/qtcommon.nsh8
-rw-r--r--tools/installer/nsis/includes/qtenv.nsh8
-rw-r--r--tools/installer/nsis/includes/system.nsh8
-rw-r--r--tools/installer/nsis/installer.nsi8
-rw-r--r--tools/installer/nsis/modules/environment.nsh8
-rw-r--r--tools/installer/nsis/modules/mingw.nsh8
-rw-r--r--tools/installer/nsis/modules/opensource.nsh8
-rw-r--r--tools/installer/nsis/modules/registeruiext.nsh8
-rw-r--r--tools/installer/nsis/opensource.ini8
26 files changed, 104 insertions, 104 deletions
diff --git a/tools/installer/batch/build.bat b/tools/installer/batch/build.bat
index d6272d5..c4a8680 100755
--- a/tools/installer/batch/build.bat
+++ b/tools/installer/batch/build.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/batch/copy.bat b/tools/installer/batch/copy.bat
index f6d6ba4..d6812ac 100755
--- a/tools/installer/batch/copy.bat
+++ b/tools/installer/batch/copy.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/batch/delete.bat b/tools/installer/batch/delete.bat
index 60efbb5..a080198 100755
--- a/tools/installer/batch/delete.bat
+++ b/tools/installer/batch/delete.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/batch/env.bat b/tools/installer/batch/env.bat
index ee39537..ef7922a 100755
--- a/tools/installer/batch/env.bat
+++ b/tools/installer/batch/env.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/batch/extract.bat b/tools/installer/batch/extract.bat
index 59f7f3b..74bb0f2 100755
--- a/tools/installer/batch/extract.bat
+++ b/tools/installer/batch/extract.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/batch/installer.bat b/tools/installer/batch/installer.bat
index 83b120b..bdc69b2 100755
--- a/tools/installer/batch/installer.bat
+++ b/tools/installer/batch/installer.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/batch/log.bat b/tools/installer/batch/log.bat
index abb6b36..848cf6e 100755
--- a/tools/installer/batch/log.bat
+++ b/tools/installer/batch/log.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/batch/toupper.bat b/tools/installer/batch/toupper.bat
index 8b319ec..c058b52 100755
--- a/tools/installer/batch/toupper.bat
+++ b/tools/installer/batch/toupper.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/config/config.default.sample b/tools/installer/config/config.default.sample
index fd71165..34cbfb3 100644
--- a/tools/installer/config/config.default.sample
+++ b/tools/installer/config/config.default.sample
@@ -1,6 +1,7 @@
#############################################################################
##
## 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.
@@ -20,10 +21,9 @@
## 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/config/mingw-opensource.conf b/tools/installer/config/mingw-opensource.conf
index e182b5f..ec45bd5 100644
--- a/tools/installer/config/mingw-opensource.conf
+++ b/tools/installer/config/mingw-opensource.conf
@@ -1,6 +1,7 @@
#############################################################################
##
## 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.
@@ -20,10 +21,9 @@
## 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/iwmake.bat b/tools/installer/iwmake.bat
index a9f53d8..803ca60 100755
--- a/tools/installer/iwmake.bat
+++ b/tools/installer/iwmake.bat
@@ -1,6 +1,7 @@
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: 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.
@@ -20,10 +21,9 @@
:: 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/confirmpage.ini b/tools/installer/nsis/confirmpage.ini
index 7ac30d6..21e1e87 100644
--- a/tools/installer/nsis/confirmpage.ini
+++ b/tools/installer/nsis/confirmpage.ini
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/gwdownload.ini b/tools/installer/nsis/gwdownload.ini
index 35eef46..5eb1540 100644
--- a/tools/installer/nsis/gwdownload.ini
+++ b/tools/installer/nsis/gwdownload.ini
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/gwmirror.ini b/tools/installer/nsis/gwmirror.ini
index 85a7440..2c3b182 100644
--- a/tools/installer/nsis/gwmirror.ini
+++ b/tools/installer/nsis/gwmirror.ini
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/includes/global.nsh b/tools/installer/nsis/includes/global.nsh
index 6b32190..31022ef 100644
--- a/tools/installer/nsis/includes/global.nsh
+++ b/tools/installer/nsis/includes/global.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/includes/instdir.nsh b/tools/installer/nsis/includes/instdir.nsh
index 037dc2a..f42b733 100644
--- a/tools/installer/nsis/includes/instdir.nsh
+++ b/tools/installer/nsis/includes/instdir.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/includes/list.nsh b/tools/installer/nsis/includes/list.nsh
index c232e8b..486015a 100644
--- a/tools/installer/nsis/includes/list.nsh
+++ b/tools/installer/nsis/includes/list.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index c0be566..3a91e07 100644
--- a/tools/installer/nsis/includes/qtcommon.nsh
+++ b/tools/installer/nsis/includes/qtcommon.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/includes/qtenv.nsh b/tools/installer/nsis/includes/qtenv.nsh
index 42191f9..fd61810 100644
--- a/tools/installer/nsis/includes/qtenv.nsh
+++ b/tools/installer/nsis/includes/qtenv.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/includes/system.nsh b/tools/installer/nsis/includes/system.nsh
index 5788eb8..a936c04 100644
--- a/tools/installer/nsis/includes/system.nsh
+++ b/tools/installer/nsis/includes/system.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/installer.nsi b/tools/installer/nsis/installer.nsi
index de1cbe2..fa1294c 100644
--- a/tools/installer/nsis/installer.nsi
+++ b/tools/installer/nsis/installer.nsi
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/environment.nsh b/tools/installer/nsis/modules/environment.nsh
index b661983..889cc42 100644
--- a/tools/installer/nsis/modules/environment.nsh
+++ b/tools/installer/nsis/modules/environment.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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 c3cc236..42d0340 100644
--- a/tools/installer/nsis/modules/mingw.nsh
+++ b/tools/installer/nsis/modules/mingw.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/opensource.nsh b/tools/installer/nsis/modules/opensource.nsh
index 5638fb0..8371975 100644
--- a/tools/installer/nsis/modules/opensource.nsh
+++ b/tools/installer/nsis/modules/opensource.nsh
@@ -1,5 +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.
@@ -19,10 +20,9 @@
;; 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 2602187..706a2ce 100644
--- a/tools/installer/nsis/modules/registeruiext.nsh
+++ b/tools/installer/nsis/modules/registeruiext.nsh
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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/opensource.ini b/tools/installer/nsis/opensource.ini
index 27428c2..67200ca 100644
--- a/tools/installer/nsis/opensource.ini
+++ b/tools/installer/nsis/opensource.ini
@@ -1,6 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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.
@@ -20,10 +21,9 @@
;; 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.