diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 14:10:20 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 14:10:20 +0200 |
| commit | d4a4b01f2f08a9031d692344d0d264de472da25e (patch) | |
| tree | d7cf58d0971630c62eb87a7aed17917b23f53e4b /tools/installer | |
| parent | b36b2605961afef44c78c47b06feb64bedbd3563 (diff) | |
| parent | 058520de736230b6867210c3f7c12d976c15adde (diff) | |
Merge branch '4.5' into 4.6
Conflicts:
doc/src/frameworks-technologies/dbus-adaptors.qdoc
doc/src/qtdbus.qdoc
src/gui/accessible/qaccessible_mac_cocoa.mm
src/gui/kernel/qapplication_win.cpp
src/xmlpatterns/parser/createTokenLookup.sh
tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
tests/auto/runQtXmlPatternsTests.sh
tests/auto/test.pl
tests/auto/uic/baseline/batchtranslation.ui
tests/auto/uic/baseline/batchtranslation.ui.h
tests/auto/uic/baseline/config.ui
tests/auto/uic/baseline/config.ui.h
tests/auto/uic/baseline/finddialog.ui
tests/auto/uic/baseline/finddialog.ui.h
tests/auto/uic/baseline/formwindowsettings.ui
tests/auto/uic/baseline/formwindowsettings.ui.h
tests/auto/uic/baseline/helpdialog.ui
tests/auto/uic/baseline/helpdialog.ui.h
tests/auto/uic/baseline/listwidgeteditor.ui
tests/auto/uic/baseline/listwidgeteditor.ui.h
tests/auto/uic/baseline/mainwindowbase.ui
tests/auto/uic/baseline/mainwindowbase.ui.h
tests/auto/uic/baseline/newactiondialog.ui
tests/auto/uic/baseline/newactiondialog.ui.h
tests/auto/uic/baseline/newform.ui
tests/auto/uic/baseline/newform.ui.h
tests/auto/uic/baseline/orderdialog.ui
tests/auto/uic/baseline/orderdialog.ui.h
tests/auto/uic/baseline/paletteeditor.ui
tests/auto/uic/baseline/paletteeditor.ui.h
tests/auto/uic/baseline/paletteeditoradvancedbase.ui
tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
tests/auto/uic/baseline/phrasebookbox.ui
tests/auto/uic/baseline/phrasebookbox.ui.h
tests/auto/uic/baseline/plugindialog.ui
tests/auto/uic/baseline/plugindialog.ui.h
tests/auto/uic/baseline/previewwidget.ui
tests/auto/uic/baseline/previewwidget.ui.h
tests/auto/uic/baseline/previewwidgetbase.ui
tests/auto/uic/baseline/previewwidgetbase.ui.h
tests/auto/uic/baseline/qfiledialog.ui
tests/auto/uic/baseline/qfiledialog.ui.h
tests/auto/uic/baseline/qtgradientdialog.ui
tests/auto/uic/baseline/qtgradientdialog.ui.h
tests/auto/uic/baseline/qtgradientviewdialog.ui
tests/auto/uic/baseline/qtgradientviewdialog.ui.h
tests/auto/uic/baseline/saveformastemplate.ui
tests/auto/uic/baseline/saveformastemplate.ui.h
tests/auto/uic/baseline/statistics.ui
tests/auto/uic/baseline/statistics.ui.h
tests/auto/uic/baseline/stringlisteditor.ui
tests/auto/uic/baseline/stringlisteditor.ui.h
tests/auto/uic/baseline/tabbedbrowser.ui
tests/auto/uic/baseline/tabbedbrowser.ui.h
tests/auto/uic/baseline/tablewidgeteditor.ui
tests/auto/uic/baseline/tablewidgeteditor.ui.h
tests/auto/uic/baseline/translatedialog.ui
tests/auto/uic/baseline/translatedialog.ui.h
tests/auto/uic/baseline/treewidgeteditor.ui
tests/auto/uic/baseline/treewidgeteditor.ui.h
tests/auto/uic/baseline/trpreviewtool.ui
tests/auto/uic/baseline/trpreviewtool.ui.h
tests/auto/uic3/baseline/about.ui
tests/auto/uic3/baseline/about.ui.4
tests/auto/uic3/baseline/actioneditor.ui
tests/auto/uic3/baseline/actioneditor.ui.4
tests/auto/uic3/baseline/config.ui
tests/auto/uic3/baseline/config.ui.4
tests/auto/uic3/baseline/configtoolboxdialog.ui
tests/auto/uic3/baseline/configtoolboxdialog.ui.4
tests/auto/uic3/baseline/connectiondialog.ui
tests/auto/uic3/baseline/connectiondialog.ui.4
tests/auto/uic3/baseline/createtemplate.ui
tests/auto/uic3/baseline/createtemplate.ui.4
tests/auto/uic3/baseline/customwidgeteditor.ui
tests/auto/uic3/baseline/customwidgeteditor.ui.4
tests/auto/uic3/baseline/dbconnection.ui
tests/auto/uic3/baseline/dbconnection.ui.4
tests/auto/uic3/baseline/dbconnectioneditor.ui
tests/auto/uic3/baseline/dbconnectioneditor.ui.4
tests/auto/uic3/baseline/dbconnections.ui
tests/auto/uic3/baseline/dbconnections.ui.4
tests/auto/uic3/baseline/editfunctions.ui
tests/auto/uic3/baseline/editfunctions.ui.4
tests/auto/uic3/baseline/finddialog.ui
tests/auto/uic3/baseline/finddialog.ui.4
tests/auto/uic3/baseline/formsettings.ui
tests/auto/uic3/baseline/formsettings.ui.4
tests/auto/uic3/baseline/gotolinedialog.ui
tests/auto/uic3/baseline/gotolinedialog.ui.4
tests/auto/uic3/baseline/helpdialog.ui
tests/auto/uic3/baseline/helpdialog.ui.4
tests/auto/uic3/baseline/iconvieweditor.ui
tests/auto/uic3/baseline/iconvieweditor.ui.4
tests/auto/uic3/baseline/listboxeditor.ui
tests/auto/uic3/baseline/listboxeditor.ui.4
tests/auto/uic3/baseline/listeditor.ui
tests/auto/uic3/baseline/listeditor.ui.4
tests/auto/uic3/baseline/listvieweditor.ui
tests/auto/uic3/baseline/listvieweditor.ui.4
tests/auto/uic3/baseline/mainfilesettings.ui
tests/auto/uic3/baseline/mainfilesettings.ui.4
tests/auto/uic3/baseline/mainwindowbase.ui
tests/auto/uic3/baseline/mainwindowbase.ui.4
tests/auto/uic3/baseline/mainwindowwizard.ui
tests/auto/uic3/baseline/mainwindowwizard.ui.4
tests/auto/uic3/baseline/multilineeditor.ui
tests/auto/uic3/baseline/multilineeditor.ui.4
tests/auto/uic3/baseline/newform.ui
tests/auto/uic3/baseline/newform.ui.4
tests/auto/uic3/baseline/paletteeditor.ui
tests/auto/uic3/baseline/paletteeditor.ui.4
tests/auto/uic3/baseline/paletteeditoradvanced.ui
tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
tests/auto/uic3/baseline/pixmapcollectioneditor.ui
tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
tests/auto/uic3/baseline/pixmapfunction.ui
tests/auto/uic3/baseline/pixmapfunction.ui.4
tests/auto/uic3/baseline/preferences.ui
tests/auto/uic3/baseline/preferences.ui.4
tests/auto/uic3/baseline/previewwidget.ui
tests/auto/uic3/baseline/previewwidget.ui.4
tests/auto/uic3/baseline/previewwidgetbase.ui
tests/auto/uic3/baseline/previewwidgetbase.ui.4
tests/auto/uic3/baseline/projectsettings.ui
tests/auto/uic3/baseline/projectsettings.ui.4
tests/auto/uic3/baseline/replacedialog.ui
tests/auto/uic3/baseline/replacedialog.ui.4
tests/auto/uic3/baseline/richtextfontdialog.ui
tests/auto/uic3/baseline/richtextfontdialog.ui.4
tests/auto/uic3/baseline/settingsdialog.ui
tests/auto/uic3/baseline/settingsdialog.ui.4
tests/auto/uic3/baseline/sqlformwizard.ui
tests/auto/uic3/baseline/sqlformwizard.ui.4
tests/auto/uic3/baseline/startdialog.ui
tests/auto/uic3/baseline/startdialog.ui.4
tests/auto/uic3/baseline/statistics.ui
tests/auto/uic3/baseline/statistics.ui.4
tests/auto/uic3/baseline/tabbedbrowser.ui
tests/auto/uic3/baseline/tabbedbrowser.ui.4
tests/auto/uic3/baseline/tableeditor.ui
tests/auto/uic3/baseline/tableeditor.ui.4
tests/auto/uic3/baseline/topicchooser.ui
tests/auto/uic3/baseline/topicchooser.ui.4
tests/auto/uic3/baseline/variabledialog.ui
tests/auto/uic3/baseline/variabledialog.ui.4
tests/auto/uic3/baseline/wizardeditor.ui.4
tests/auto/uiloader/baseline/batchtranslation.ui
tests/auto/uiloader/baseline/config.ui
tests/auto/uiloader/baseline/finddialog.ui
tests/auto/uiloader/baseline/formwindowsettings.ui
tests/auto/uiloader/baseline/helpdialog.ui
tests/auto/uiloader/baseline/listwidgeteditor.ui
tests/auto/uiloader/baseline/mainwindowbase.ui
tests/auto/uiloader/baseline/newactiondialog.ui
tests/auto/uiloader/baseline/newform.ui
tests/auto/uiloader/baseline/orderdialog.ui
tests/auto/uiloader/baseline/paletteeditor.ui
tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
tests/auto/uiloader/baseline/phrasebookbox.ui
tests/auto/uiloader/baseline/plugindialog.ui
tests/auto/uiloader/baseline/previewwidget.ui
tests/auto/uiloader/baseline/previewwidgetbase.ui
tests/auto/uiloader/baseline/qfiledialog.ui
tests/auto/uiloader/baseline/qtgradientdialog.ui
tests/auto/uiloader/baseline/qtgradienteditor.ui
tests/auto/uiloader/baseline/qtgradientviewdialog.ui
tests/auto/uiloader/baseline/saveformastemplate.ui
tests/auto/uiloader/baseline/statistics.ui
tests/auto/uiloader/baseline/stringlisteditor.ui
tests/auto/uiloader/baseline/tabbedbrowser.ui
tests/auto/uiloader/baseline/tablewidgeteditor.ui
tests/auto/uiloader/baseline/translatedialog.ui
tests/auto/uiloader/baseline/treewidgeteditor.ui
tests/auto/uiloader/baseline/trpreviewtool.ui
tools/assistant/compat/mainwindow.cpp
tools/assistant/tools/assistant/mainwindow.cpp
tools/designer/src/designer/versiondialog.cpp
tools/linguist/linguist/mainwindow.cpp
tools/linguist/shared/make-qscript.sh
tools/qdbus/qdbusviewer/qdbusviewer.cpp
Diffstat (limited to 'tools/installer')
26 files changed, 4 insertions, 83 deletions
diff --git a/tools/installer/batch/build.bat b/tools/installer/batch/build.bat index 6031c40899..d6272d5a31 100755 --- a/tools/installer/batch/build.bat +++ b/tools/installer/batch/build.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: call :%1 %2 goto END diff --git a/tools/installer/batch/copy.bat b/tools/installer/batch/copy.bat index cccb992244..f6d6ba4c8e 100755 --- a/tools/installer/batch/copy.bat +++ b/tools/installer/batch/copy.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: call :%1 %2 goto END diff --git a/tools/installer/batch/delete.bat b/tools/installer/batch/delete.bat index 843ce794f7..60efbb5cff 100755 --- a/tools/installer/batch/delete.bat +++ b/tools/installer/batch/delete.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: call :%1 %2 goto END diff --git a/tools/installer/batch/env.bat b/tools/installer/batch/env.bat index a7693fc33f..ee395375c1 100755 --- a/tools/installer/batch/env.bat +++ b/tools/installer/batch/env.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: call :%1 %2 goto END diff --git a/tools/installer/batch/extract.bat b/tools/installer/batch/extract.bat index 9c4dd2fd63..59f7f3b880 100755 --- a/tools/installer/batch/extract.bat +++ b/tools/installer/batch/extract.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: call :%1 %2 goto END diff --git a/tools/installer/batch/installer.bat b/tools/installer/batch/installer.bat index 01e024ed6b..83b120b754 100755 --- a/tools/installer/batch/installer.bat +++ b/tools/installer/batch/installer.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: call :%1 %2 goto END diff --git a/tools/installer/batch/log.bat b/tools/installer/batch/log.bat index 3460377607..abb6b364cc 100755 --- a/tools/installer/batch/log.bat +++ b/tools/installer/batch/log.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: call :%1 %2 goto END diff --git a/tools/installer/batch/toupper.bat b/tools/installer/batch/toupper.bat index da3339bc1a..8b319ec7aa 100755 --- a/tools/installer/batch/toupper.bat +++ b/tools/installer/batch/toupper.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: set IWMAKE_RESULT=%1 if [%IWMAKE_RESULT%]==[] goto :eof diff --git a/tools/installer/config/config.default.sample b/tools/installer/config/config.default.sample index 640db4bebd..fd711650c3 100644 --- a/tools/installer/config/config.default.sample +++ b/tools/installer/config/config.default.sample @@ -37,9 +37,6 @@ ## ## $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. -## ############################################################################# # root directory diff --git a/tools/installer/config/mingw-opensource.conf b/tools/installer/config/mingw-opensource.conf index 78d372d9ab..e182b5f0ac 100644 --- a/tools/installer/config/mingw-opensource.conf +++ b/tools/installer/config/mingw-opensource.conf @@ -37,9 +37,6 @@ ## ## $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. -## ############################################################################# #extracts the package to buildDir diff --git a/tools/installer/iwmake.bat b/tools/installer/iwmake.bat index 08e647fae3..a9f53d872a 100755 --- a/tools/installer/iwmake.bat +++ b/tools/installer/iwmake.bat @@ -37,9 +37,6 @@ :: :: $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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: rem @echo off call :init diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini index 00df3ec859..7ac30d6e58 100644 --- a/tools/installer/nsis/confirmpage.ini +++ b/tools/installer/nsis/confirmpage.ini @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Ini file generated by the HM NIS Edit IO designer. [Settings] diff --git a/tools/installer/nsis/gwdownload.ini b/tools/installer/nsis/gwdownload.ini index 42351d1702..35eef46f5b 100644 --- a/tools/installer/nsis/gwdownload.ini +++ b/tools/installer/nsis/gwdownload.ini @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Ini file generated by the HM NIS Edit IO designer. [Settings] diff --git a/tools/installer/nsis/gwmirror.ini b/tools/installer/nsis/gwmirror.ini index 2757177144..85a7440aec 100644 --- a/tools/installer/nsis/gwmirror.ini +++ b/tools/installer/nsis/gwmirror.ini @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Ini file generated by the HM NIS Edit IO designer. [Settings] diff --git a/tools/installer/nsis/includes/global.nsh b/tools/installer/nsis/includes/global.nsh index 7905040add..6b321907f2 100644 --- a/tools/installer/nsis/includes/global.nsh +++ b/tools/installer/nsis/includes/global.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !include "StrFunc.nsh" !include "includes\list.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 0a3bde7945..037dc2a220 100644 --- a/tools/installer/nsis/includes/instdir.nsh +++ b/tools/installer/nsis/includes/instdir.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !ifndef INSTDIR_1 !macro INSTDIR_INITIALIZE @@ -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 cfaeb79024..c232e8bcf2 100644 --- a/tools/installer/nsis/includes/list.nsh +++ b/tools/installer/nsis/includes/list.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !ifndef LIST_INCLUDE !define 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 986ca64166..c0be566a21 100644 --- a/tools/installer/nsis/includes/qtcommon.nsh +++ b/tools/installer/nsis/includes/qtcommon.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !ifndef QTCOMMON_INCLUDE !define QTCOMMON_INCLUDE diff --git a/tools/installer/nsis/includes/qtenv.nsh b/tools/installer/nsis/includes/qtenv.nsh index 552cae9c2a..42191f98b2 100644 --- a/tools/installer/nsis/includes/qtenv.nsh +++ b/tools/installer/nsis/includes/qtenv.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !ifndef QTENV_INCLUDE !define QTENV_INCLUDE diff --git a/tools/installer/nsis/includes/system.nsh b/tools/installer/nsis/includes/system.nsh index 8b0b4b99f6..5788eb8806 100644 --- a/tools/installer/nsis/includes/system.nsh +++ b/tools/installer/nsis/includes/system.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !ifndef SYSTEM_INCLUDE !define 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 d870a570b4..de1cbe2c88 100644 --- a/tools/installer/nsis/installer.nsi +++ b/tools/installer/nsis/installer.nsi @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; 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 bedf2d08bb..b66198387a 100644 --- a/tools/installer/nsis/modules/environment.nsh +++ b/tools/installer/nsis/modules/environment.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !ifdef MODULE_ENVIRONMENT !macro ENVIRONMENT_INITIALIZE diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh index 3e40fe2383..c3cc23653f 100644 --- a/tools/installer/nsis/modules/mingw.nsh +++ b/tools/installer/nsis/modules/mingw.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !ifdef MODULE_MINGW !macro MINGW_INITIALIZE diff --git a/tools/installer/nsis/modules/opensource.nsh b/tools/installer/nsis/modules/opensource.nsh index 26dcc1da5a..5638fb08e9 100644 --- a/tools/installer/nsis/modules/opensource.nsh +++ b/tools/installer/nsis/modules/opensource.nsh @@ -1,4 +1,3 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ;; Contact: Nokia Corporation (qt-info@nokia.com) @@ -37,9 +36,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; !ifdef MODULE_OPENSOURCE !macro OPENSOURCE_INITIALIZE diff --git a/tools/installer/nsis/modules/registeruiext.nsh b/tools/installer/nsis/modules/registeruiext.nsh index b7a3ee632a..2602187556 100644 --- a/tools/installer/nsis/modules/registeruiext.nsh +++ b/tools/installer/nsis/modules/registeruiext.nsh @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; UI Extension Module diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini index 53f47af236..27428c2eb1 100644 --- a/tools/installer/nsis/opensource.ini +++ b/tools/installer/nsis/opensource.ini @@ -37,9 +37,6 @@ ;; ;; $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. -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Ini file generated by the HM NIS Edit IO designer. [Settings] |