summaryrefslogtreecommitdiffstats
path: root/tools/installer
diff options
context:
space:
mode:
Diffstat (limited to 'tools/installer')
-rwxr-xr-xtools/installer/batch/build.bat33
-rwxr-xr-xtools/installer/batch/copy.bat33
-rwxr-xr-xtools/installer/batch/delete.bat33
-rwxr-xr-xtools/installer/batch/env.bat33
-rwxr-xr-xtools/installer/batch/extract.bat33
-rwxr-xr-xtools/installer/batch/installer.bat33
-rwxr-xr-xtools/installer/batch/log.bat33
-rwxr-xr-xtools/installer/batch/toupper.bat33
-rw-r--r--tools/installer/config/config.default.sample33
-rw-r--r--tools/installer/config/mingw-opensource.conf33
-rwxr-xr-xtools/installer/iwmake.bat33
-rw-r--r--tools/installer/nsis/confirmpage.ini33
-rw-r--r--tools/installer/nsis/gwdownload.ini33
-rw-r--r--tools/installer/nsis/gwmirror.ini33
-rw-r--r--tools/installer/nsis/includes/global.nsh35
-rw-r--r--tools/installer/nsis/includes/instdir.nsh35
-rw-r--r--tools/installer/nsis/includes/list.nsh35
-rw-r--r--tools/installer/nsis/includes/qtcommon.nsh57
-rw-r--r--tools/installer/nsis/includes/qtenv.nsh33
-rw-r--r--tools/installer/nsis/includes/system.nsh35
-rw-r--r--tools/installer/nsis/installer.nsi33
-rw-r--r--tools/installer/nsis/modules/environment.nsh33
-rw-r--r--tools/installer/nsis/modules/mingw.nsh36
-rw-r--r--tools/installer/nsis/modules/opensource.nsh34
-rw-r--r--tools/installer/nsis/modules/registeruiext.nsh33
-rw-r--r--tools/installer/nsis/opensource.ini33
26 files changed, 395 insertions, 499 deletions
diff --git a/tools/installer/batch/build.bat b/tools/installer/batch/build.bat
index b08624927..c4a8680c8 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call :%1 %2
diff --git a/tools/installer/batch/copy.bat b/tools/installer/batch/copy.bat
index cfca13a97..d6812ac51 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call :%1 %2
diff --git a/tools/installer/batch/delete.bat b/tools/installer/batch/delete.bat
index 595b5b33b..a08019835 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call :%1 %2
diff --git a/tools/installer/batch/env.bat b/tools/installer/batch/env.bat
index c4dca254a..ef7922aca 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call :%1 %2
diff --git a/tools/installer/batch/extract.bat b/tools/installer/batch/extract.bat
index a79568124..74bb0f202 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call :%1 %2
diff --git a/tools/installer/batch/installer.bat b/tools/installer/batch/installer.bat
index cff658e2d..bdc69b27e 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call :%1 %2
diff --git a/tools/installer/batch/log.bat b/tools/installer/batch/log.bat
index a857223d5..848cf6e77 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call :%1 %2
diff --git a/tools/installer/batch/toupper.bat b/tools/installer/batch/toupper.bat
index 0e22bb5b3..c058b52cb 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
set IWMAKE_RESULT=%1
diff --git a/tools/installer/config/config.default.sample b/tools/installer/config/config.default.sample
index 8c756ccaf..34cbfb379 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
## 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.0, 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.
+##
+##
##
-## 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 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
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+##
+##
+##
+## $QT_END_LICENSE$
##
#############################################################################
diff --git a/tools/installer/config/mingw-opensource.conf b/tools/installer/config/mingw-opensource.conf
index 198324305..ec45bd564 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
## 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.0, 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.
+##
+##
##
-## 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 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
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+##
+##
+##
+## $QT_END_LICENSE$
##
#############################################################################
#extracts the package to buildDir
diff --git a/tools/installer/iwmake.bat b/tools/installer/iwmake.bat
index 1a032555b..803ca6078 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
:: 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.0, 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.
+::
+::
::
-:: 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 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
-:: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+::
+::
+::
+:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
rem @echo off
diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini
index d1c51efae..21e1e8777 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Ini file generated by the HM NIS Edit IO designer.
diff --git a/tools/installer/nsis/gwdownload.ini b/tools/installer/nsis/gwdownload.ini
index 037464267..5eb15409c 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Ini file generated by the HM NIS Edit IO designer.
diff --git a/tools/installer/nsis/gwmirror.ini b/tools/installer/nsis/gwmirror.ini
index 4b7fb74c5..2c3b18227 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Ini file generated by the HM NIS Edit IO designer.
diff --git a/tools/installer/nsis/includes/global.nsh b/tools/installer/nsis/includes/global.nsh
index 322d2acf6..31022efe0 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!include "StrFunc.nsh"
@@ -143,4 +140,4 @@ FunctionEnd
call un.ConfirmOnDelete
ClearErrors
pop $0
-!macroend \ No newline at end of file
+!macroend
diff --git a/tools/installer/nsis/includes/instdir.nsh b/tools/installer/nsis/includes/instdir.nsh
index 95cc70295..f42b733d0 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifndef INSTDIR_1
@@ -254,4 +251,4 @@
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "${INSTDIR_INI_FILE}"
!macroend
-!endif ;ifndef INSTDIR_1 \ No newline at end of file
+!endif ;ifndef INSTDIR_1
diff --git a/tools/installer/nsis/includes/list.nsh b/tools/installer/nsis/includes/list.nsh
index 95a52d3f6..486015a9e 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifndef LIST_INCLUDE
@@ -136,4 +133,4 @@ Function GetItemInList
exch $0
FunctionEnd
-!endif ;LIST_INCLUDE \ No newline at end of file
+!endif ;LIST_INCLUDE
diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index df1ebdf87..3a91e075a 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifndef QTCOMMON_INCLUDE
@@ -72,28 +69,6 @@ FunctionEnd
!insertmacro MakeQtDirectory ""
!insertmacro MakeQtDirectory "un."
-Function DeleteFloatingLicenseProgram
- exch $1
- push $0
-
- StrCmp $LICENSE_KEY "" end
-
- ClearErrors
- !ifndef OPENSOURCE_BUILD
- qtnsisext::IsFloatingLicense $LICENSE_KEY
- !endif
- IfErrors end
- pop $0
-
- StrCmp $0 "1" end
- IfFileExists "$1\bin\qtusagereporter.exe" 0 end
- Delete "$1\bin\qtusagereporter.exe"
-
- end:
- pop $0
- pop $1
-FunctionEnd
-
Function AddStartmenuApplication
exch $0
IfFileExists "$0\assistant.exe" 0 +2
@@ -571,4 +546,4 @@ directoryOk:
done:
FunctionEnd
-!endif ;QTCOMMON_INCLUDE \ No newline at end of file
+!endif ;QTCOMMON_INCLUDE
diff --git a/tools/installer/nsis/includes/qtenv.nsh b/tools/installer/nsis/includes/qtenv.nsh
index a14a64dd1..fd6181044 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifndef QTENV_INCLUDE
diff --git a/tools/installer/nsis/includes/system.nsh b/tools/installer/nsis/includes/system.nsh
index 6d419486c..a936c046b 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifndef SYSTEM_INCLUDE
@@ -269,4 +266,4 @@ FunctionEnd
!insertmacro AdministratorRights ""
!insertmacro AdministratorRights "un."
-!endif ;SYSTEM_INCLUDE \ No newline at end of file
+!endif ;SYSTEM_INCLUDE
diff --git a/tools/installer/nsis/installer.nsi b/tools/installer/nsis/installer.nsi
index a079f2c7c..fa1294cb0 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Script generated by the HM NIS Edit Script Wizard.
diff --git a/tools/installer/nsis/modules/environment.nsh b/tools/installer/nsis/modules/environment.nsh
index 7b6c5af4d..889cc4238 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifdef MODULE_ENVIRONMENT
diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh
index 386d7d7f8..42d034003 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifdef MODULE_MINGW
@@ -107,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 2a3b4e495..8371975cd 100644
--- a/tools/installer/nsis/modules/opensource.nsh
+++ b/tools/installer/nsis/modules/opensource.nsh
@@ -1,6 +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.
@@ -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
@@ -20,25 +20,21 @@
;; 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.0, 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.
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifdef MODULE_OPENSOURCE
diff --git a/tools/installer/nsis/modules/registeruiext.nsh b/tools/installer/nsis/modules/registeruiext.nsh
index 429e14a11..706a2ce9a 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; UI Extension Module
diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini
index 6b4f4be3c..67200ca06 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.
@@ -9,8 +10,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
@@ -20,25 +21,21 @@
;; 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.0, 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.
+;;
+;;
;;
-;; 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 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
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+;;
+;;
+;;
+;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Ini file generated by the HM NIS Edit IO designer.