diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 10:06:26 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 10:06:26 (GMT) |
commit | 2991e45683d02660294f34d074ef3366d0f62a73 (patch) | |
tree | 7d21ad10762c939422ccf2b13e30e61debe20098 /tools/installer | |
parent | 266f578ebe20b9885421effec0a91f9c025fd11e (diff) | |
parent | a475d029f7dc93534087b8d069b6eb1222389c65 (diff) | |
download | Qt-2991e45683d02660294f34d074ef3366d0f62a73.zip Qt-2991e45683d02660294f34d074ef3366d0f62a73.tar.gz Qt-2991e45683d02660294f34d074ef3366d0f62a73.tar.bz2 |
Merge branch '4.5' into 4.6
Conflicts:
demos/boxes/glshaders.cpp
demos/boxes/vector.h
demos/embedded/fluidlauncher/pictureflow.cpp
demos/embedded/fluidlauncher/pictureflow.h
doc/src/desktop-integration.qdoc
doc/src/distributingqt.qdoc
doc/src/examples-overview.qdoc
doc/src/examples.qdoc
doc/src/frameworks-technologies/dbus-adaptors.qdoc
doc/src/geometry.qdoc
doc/src/groups.qdoc
doc/src/objecttrees.qdoc
doc/src/platform-notes.qdoc
doc/src/plugins-howto.qdoc
doc/src/qt3support.qdoc
doc/src/qtdbus.qdoc
doc/src/qtdesigner.qdoc
doc/src/qtgui.qdoc
doc/src/qtmain.qdoc
doc/src/qtopengl.qdoc
doc/src/qtsvg.qdoc
doc/src/qtuiloader.qdoc
doc/src/qundo.qdoc
doc/src/richtext.qdoc
doc/src/topics.qdoc
src/corelib/tools/qdumper.cpp
src/gui/embedded/qkbdpc101_qws.cpp
src/gui/embedded/qkbdsl5000_qws.cpp
src/gui/embedded/qkbdusb_qws.cpp
src/gui/embedded/qkbdvr41xx_qws.cpp
src/gui/embedded/qkbdyopy_qws.cpp
src/gui/embedded/qmousebus_qws.cpp
src/gui/embedded/qmousevr41xx_qws.cpp
src/gui/embedded/qmouseyopy_qws.cpp
src/gui/painting/qpaintengine_d3d.cpp
src/gui/painting/qwindowsurface_d3d.cpp
src/opengl/gl2paintengineex/glgc_shader_source.h
src/opengl/gl2paintengineex/qglpexshadermanager.cpp
src/opengl/gl2paintengineex/qglpexshadermanager_p.h
src/opengl/gl2paintengineex/qglshader.cpp
src/opengl/gl2paintengineex/qglshader_p.h
src/opengl/util/fragmentprograms_p.h
src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp
src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
src/script/parser/qscript.g
src/script/qscriptarray_p.h
src/script/qscriptasm_p.h
src/script/qscriptbuffer_p.h
src/script/qscriptclass.cpp
src/script/qscriptclassdata_p.h
src/script/qscriptcompiler.cpp
src/script/qscriptcompiler_p.h
src/script/qscriptcontext.cpp
src/script/qscriptcontext_p.cpp
src/script/qscriptcontext_p.h
src/script/qscriptcontextfwd_p.h
src/script/qscriptecmaarray.cpp
src/script/qscriptecmaarray_p.h
src/script/qscriptecmaboolean.cpp
src/script/qscriptecmacore.cpp
src/script/qscriptecmadate.cpp
src/script/qscriptecmadate_p.h
src/script/qscriptecmaerror.cpp
src/script/qscriptecmaerror_p.h
src/script/qscriptecmafunction.cpp
src/script/qscriptecmafunction_p.h
src/script/qscriptecmaglobal.cpp
src/script/qscriptecmaglobal_p.h
src/script/qscriptecmamath.cpp
src/script/qscriptecmamath_p.h
src/script/qscriptecmanumber.cpp
src/script/qscriptecmanumber_p.h
src/script/qscriptecmaobject.cpp
src/script/qscriptecmaobject_p.h
src/script/qscriptecmaregexp.cpp
src/script/qscriptecmaregexp_p.h
src/script/qscriptecmastring.cpp
src/script/qscriptecmastring_p.h
src/script/qscriptengine.cpp
src/script/qscriptengine_p.cpp
src/script/qscriptengine_p.h
src/script/qscriptenginefwd_p.h
src/script/qscriptextenumeration.cpp
src/script/qscriptextenumeration_p.h
src/script/qscriptextqobject.cpp
src/script/qscriptextqobject_p.h
src/script/qscriptextvariant.cpp
src/script/qscriptfunction.cpp
src/script/qscriptfunction_p.h
src/script/qscriptgc_p.h
src/script/qscriptmember_p.h
src/script/qscriptobject_p.h
src/script/qscriptprettypretty.cpp
src/script/qscriptprettypretty_p.h
src/script/qscriptvalue.cpp
src/script/qscriptvalueimpl.cpp
src/script/qscriptvalueimpl_p.h
src/script/qscriptvalueimplfwd_p.h
src/script/qscriptvalueiteratorimpl.cpp
src/script/qscriptxmlgenerator.cpp
src/script/qscriptxmlgenerator_p.h
tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
tools/linguist/shared/cpp.cpp
Diffstat (limited to 'tools/installer')
26 files changed, 338 insertions, 338 deletions
diff --git a/tools/installer/batch/build.bat b/tools/installer/batch/build.bat index b086249..6031c40 100755 --- a/tools/installer/batch/build.bat +++ b/tools/installer/batch/build.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/batch/copy.bat b/tools/installer/batch/copy.bat index cfca13a..cccb992 100755 --- a/tools/installer/batch/copy.bat +++ b/tools/installer/batch/copy.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/batch/delete.bat b/tools/installer/batch/delete.bat index 595b5b3..843ce79 100755 --- a/tools/installer/batch/delete.bat +++ b/tools/installer/batch/delete.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/batch/env.bat b/tools/installer/batch/env.bat index c4dca25..a7693fc 100755 --- a/tools/installer/batch/env.bat +++ b/tools/installer/batch/env.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/batch/extract.bat b/tools/installer/batch/extract.bat index a795681..9c4dd2f 100755 --- a/tools/installer/batch/extract.bat +++ b/tools/installer/batch/extract.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/batch/installer.bat b/tools/installer/batch/installer.bat index cff658e..01e024e 100755 --- a/tools/installer/batch/installer.bat +++ b/tools/installer/batch/installer.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/batch/log.bat b/tools/installer/batch/log.bat index a857223..3460377 100755 --- a/tools/installer/batch/log.bat +++ b/tools/installer/batch/log.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/batch/toupper.bat b/tools/installer/batch/toupper.bat index 0e22bb5..da3339b 100755 --- a/tools/installer/batch/toupper.bat +++ b/tools/installer/batch/toupper.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/config/config.default.sample b/tools/installer/config/config.default.sample index 8c756cc..640db4b 100644 --- a/tools/installer/config/config.default.sample +++ b/tools/installer/config/config.default.sample @@ -9,8 +9,8 @@ ## No Commercial Usage ## This file contains pre-release code and may not be distributed. ## You may use this file in accordance with the terms and conditions -## contained in the either Technology Preview License Agreement or the -## Beta Release License Agreement. +## contained in the Technology Preview License Agreement accompanying +## this package. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## ## In addition, as a special exception, Nokia gives you certain -## additional rights. These rights are described in the Nokia Qt LGPL -## Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +## additional rights. These rights are described in the Nokia Qt LGPL +## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ## package. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## +## +## +## +## +## +## ## -## If you are unsure which license is appropriate for your use, please -## contact the sales department at http://qt.nokia.com/contact. ## $QT_END_LICENSE$ ## ## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/config/mingw-opensource.conf b/tools/installer/config/mingw-opensource.conf index 1983243..78d372d 100644 --- a/tools/installer/config/mingw-opensource.conf +++ b/tools/installer/config/mingw-opensource.conf @@ -9,8 +9,8 @@ ## No Commercial Usage ## This file contains pre-release code and may not be distributed. ## You may use this file in accordance with the terms and conditions -## contained in the either Technology Preview License Agreement or the -## Beta Release License Agreement. +## contained in the Technology Preview License Agreement accompanying +## this package. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ## ## In addition, as a special exception, Nokia gives you certain -## additional rights. These rights are described in the Nokia Qt LGPL -## Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +## additional rights. These rights are described in the Nokia Qt LGPL +## Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ## package. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## +## +## +## +## +## +## ## -## If you are unsure which license is appropriate for your use, please -## contact the sales department at http://qt.nokia.com/contact. ## $QT_END_LICENSE$ ## ## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/iwmake.bat b/tools/installer/iwmake.bat index 1a03255..08e647f 100755 --- a/tools/installer/iwmake.bat +++ b/tools/installer/iwmake.bat @@ -9,8 +9,8 @@ :: No Commercial Usage :: This file contains pre-release code and may not be distributed. :: You may use this file in accordance with the terms and conditions -:: contained in the either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: contained in the Technology Preview License Agreement accompanying +:: this package. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ :: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. :: :: In addition, as a special exception, Nokia gives you certain -:: additional rights. These rights are described in the Nokia Qt LGPL -:: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +:: additional rights. These rights are described in the Nokia Qt LGPL +:: Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this :: package. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. +:: If you have questions regarding the use of this file, please contact +:: Nokia at qt-info@nokia.com. +:: +:: +:: +:: +:: +:: +:: :: -:: If you are unsure which license is appropriate for your use, please -:: contact the sales department at http://qt.nokia.com/contact. :: $QT_END_LICENSE$ :: :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini index d1c51ef..00df3ec 100644 --- a/tools/installer/nsis/confirmpage.ini +++ b/tools/installer/nsis/confirmpage.ini @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/gwdownload.ini b/tools/installer/nsis/gwdownload.ini index 0374642..42351d1 100644 --- a/tools/installer/nsis/gwdownload.ini +++ b/tools/installer/nsis/gwdownload.ini @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/gwmirror.ini b/tools/installer/nsis/gwmirror.ini index 4b7fb74..2757177 100644 --- a/tools/installer/nsis/gwmirror.ini +++ b/tools/installer/nsis/gwmirror.ini @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/includes/global.nsh b/tools/installer/nsis/includes/global.nsh index 322d2ac..7905040 100644 --- a/tools/installer/nsis/includes/global.nsh +++ b/tools/installer/nsis/includes/global.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/includes/instdir.nsh b/tools/installer/nsis/includes/instdir.nsh index 95cc702..0a3bde7 100644 --- a/tools/installer/nsis/includes/instdir.nsh +++ b/tools/installer/nsis/includes/instdir.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/includes/list.nsh b/tools/installer/nsis/includes/list.nsh index 95a52d3..cfaeb79 100644 --- a/tools/installer/nsis/includes/list.nsh +++ b/tools/installer/nsis/includes/list.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh index 9c0756a..986ca64 100644 --- a/tools/installer/nsis/includes/qtcommon.nsh +++ b/tools/installer/nsis/includes/qtcommon.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/includes/qtenv.nsh b/tools/installer/nsis/includes/qtenv.nsh index a14a64d..552cae9 100644 --- a/tools/installer/nsis/includes/qtenv.nsh +++ b/tools/installer/nsis/includes/qtenv.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/includes/system.nsh b/tools/installer/nsis/includes/system.nsh index 6d41948..8b0b4b9 100644 --- a/tools/installer/nsis/includes/system.nsh +++ b/tools/installer/nsis/includes/system.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/installer.nsi b/tools/installer/nsis/installer.nsi index a079f2c..d870a57 100644 --- a/tools/installer/nsis/installer.nsi +++ b/tools/installer/nsis/installer.nsi @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/modules/environment.nsh b/tools/installer/nsis/modules/environment.nsh index 7b6c5af..bedf2d0 100644 --- a/tools/installer/nsis/modules/environment.nsh +++ b/tools/installer/nsis/modules/environment.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh index d294cb8..3e40fe2 100644 --- a/tools/installer/nsis/modules/mingw.nsh +++ b/tools/installer/nsis/modules/mingw.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/modules/opensource.nsh b/tools/installer/nsis/modules/opensource.nsh index 2a3b4e4..26dcc1d 100644 --- a/tools/installer/nsis/modules/opensource.nsh +++ b/tools/installer/nsis/modules/opensource.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/modules/registeruiext.nsh b/tools/installer/nsis/modules/registeruiext.nsh index 429e14a..b7a3ee6 100644 --- a/tools/installer/nsis/modules/registeruiext.nsh +++ b/tools/installer/nsis/modules/registeruiext.nsh @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini index 6b4f4be..53f47af 100644 --- a/tools/installer/nsis/opensource.ini +++ b/tools/installer/nsis/opensource.ini @@ -9,8 +9,8 @@ ;; No Commercial Usage ;; This file contains pre-release code and may not be distributed. ;; You may use this file in accordance with the terms and conditions -;; contained in the either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; contained in the Technology Preview License Agreement accompanying +;; this package. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,20 +21,20 @@ ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ;; ;; In addition, as a special exception, Nokia gives you certain -;; additional rights. These rights are described in the Nokia Qt LGPL -;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +;; additional rights. These rights are described in the Nokia Qt LGPL +;; Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ;; package. ;; -;; GNU General Public License Usage -;; Alternatively, this file may be used under the terms of the GNU -;; General Public License version 3.0 as published by the Free Software -;; Foundation and appearing in the file LICENSE.GPL included in the -;; packaging of this file. Please review the following information to -;; ensure the GNU General Public License version 3.0 requirements will be -;; met: http://www.gnu.org/copyleft/gpl.html. +;; If you have questions regarding the use of this file, please contact +;; Nokia at qt-info@nokia.com. +;; +;; +;; +;; +;; +;; +;; ;; -;; If you are unsure which license is appropriate for your use, please -;; contact the sales department at http://qt.nokia.com/contact. ;; $QT_END_LICENSE$ ;; ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |