Changeset 561 for trunk/tools/installer/nsis/includes
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
-
. (modified) (1 prop)
-
tools/installer/nsis/includes/global.nsh (modified) (3 diffs)
-
tools/installer/nsis/includes/instdir.nsh (modified) (3 diffs)
-
tools/installer/nsis/includes/list.nsh (modified) (3 diffs)
-
tools/installer/nsis/includes/qtcommon.nsh (modified) (4 diffs)
-
tools/installer/nsis/includes/qtenv.nsh (modified) (3 diffs)
-
tools/installer/nsis/includes/system.nsh (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/tools/installer/nsis/includes/global.nsh
r2 r561 2 2 ;; 3 3 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ;; Contact: Qt Software Information (qt-info@nokia.com) 4 ;; All rights reserved. 5 ;; Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ;; 6 7 ;; This file is part of the tools applications of the Qt Toolkit. … … 21 22 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ;; 23 ;; In addition, as a special exception, Nokia gives you certain 24 ;; additional rights. These rights are described in the Nokia Qt LGPL 25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ;; package. 24 ;; In addition, as a special exception, Nokia gives you certain additional 25 ;; rights. These rights are described in the Nokia Qt LGPL Exception 26 ;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ;; 28 28 ;; GNU General Public License Usage … … 34 34 ;; met: http://www.gnu.org/copyleft/gpl.html. 35 35 ;; 36 ;; If you are unsure which license is appropriate for your use, please37 ;; contact the sales department at qt-sales@nokia.com.36 ;; If you have questions regarding the use of this file, please contact 37 ;; Nokia at qt-info@nokia.com. 38 38 ;; $QT_END_LICENSE$ 39 ;;40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.42 39 ;; 43 40 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -
trunk/tools/installer/nsis/includes/instdir.nsh
r2 r561 2 2 ;; 3 3 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ;; Contact: Qt Software Information (qt-info@nokia.com) 4 ;; All rights reserved. 5 ;; Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ;; 6 7 ;; This file is part of the tools applications of the Qt Toolkit. … … 21 22 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ;; 23 ;; In addition, as a special exception, Nokia gives you certain 24 ;; additional rights. These rights are described in the Nokia Qt LGPL 25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ;; package. 24 ;; In addition, as a special exception, Nokia gives you certain additional 25 ;; rights. These rights are described in the Nokia Qt LGPL Exception 26 ;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ;; 28 28 ;; GNU General Public License Usage … … 34 34 ;; met: http://www.gnu.org/copyleft/gpl.html. 35 35 ;; 36 ;; If you are unsure which license is appropriate for your use, please37 ;; contact the sales department at qt-sales@nokia.com.36 ;; If you have questions regarding the use of this file, please contact 37 ;; Nokia at qt-info@nokia.com. 38 38 ;; $QT_END_LICENSE$ 39 ;;40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.42 39 ;; 43 40 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -
trunk/tools/installer/nsis/includes/list.nsh
r2 r561 2 2 ;; 3 3 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ;; Contact: Qt Software Information (qt-info@nokia.com) 4 ;; All rights reserved. 5 ;; Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ;; 6 7 ;; This file is part of the tools applications of the Qt Toolkit. … … 21 22 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ;; 23 ;; In addition, as a special exception, Nokia gives you certain 24 ;; additional rights. These rights are described in the Nokia Qt LGPL 25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ;; package. 24 ;; In addition, as a special exception, Nokia gives you certain additional 25 ;; rights. These rights are described in the Nokia Qt LGPL Exception 26 ;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ;; 28 28 ;; GNU General Public License Usage … … 34 34 ;; met: http://www.gnu.org/copyleft/gpl.html. 35 35 ;; 36 ;; If you are unsure which license is appropriate for your use, please37 ;; contact the sales department at qt-sales@nokia.com.36 ;; If you have questions regarding the use of this file, please contact 37 ;; Nokia at qt-info@nokia.com. 38 38 ;; $QT_END_LICENSE$ 39 ;;40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.42 39 ;; 43 40 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -
trunk/tools/installer/nsis/includes/qtcommon.nsh
r2 r561 2 2 ;; 3 3 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ;; Contact: Qt Software Information (qt-info@nokia.com) 4 ;; All rights reserved. 5 ;; Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ;; 6 7 ;; This file is part of the tools applications of the Qt Toolkit. … … 21 22 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ;; 23 ;; In addition, as a special exception, Nokia gives you certain 24 ;; additional rights. These rights are described in the Nokia Qt LGPL 25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ;; package. 24 ;; In addition, as a special exception, Nokia gives you certain additional 25 ;; rights. These rights are described in the Nokia Qt LGPL Exception 26 ;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ;; 28 28 ;; GNU General Public License Usage … … 34 34 ;; met: http://www.gnu.org/copyleft/gpl.html. 35 35 ;; 36 ;; If you are unsure which license is appropriate for your use, please37 ;; contact the sales department at qt-sales@nokia.com.36 ;; If you have questions regarding the use of this file, please contact 37 ;; Nokia at qt-info@nokia.com. 38 38 ;; $QT_END_LICENSE$ 39 ;;40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.42 39 ;; 43 40 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; … … 72 69 !insertmacro MakeQtDirectory "" 73 70 !insertmacro MakeQtDirectory "un." 74 75 Function DeleteFloatingLicenseProgram76 exch $177 push $078 79 StrCmp $LICENSE_KEY "" end80 81 ClearErrors82 !ifndef OPENSOURCE_BUILD83 qtnsisext::IsFloatingLicense $LICENSE_KEY84 !endif85 IfErrors end86 pop $087 88 StrCmp $0 "1" end89 IfFileExists "$1\bin\qtusagereporter.exe" 0 end90 Delete "$1\bin\qtusagereporter.exe"91 92 end:93 pop $094 pop $195 FunctionEnd96 71 97 72 Function AddStartmenuApplication -
trunk/tools/installer/nsis/includes/qtenv.nsh
r2 r561 2 2 ;; 3 3 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ;; Contact: Qt Software Information (qt-info@nokia.com) 4 ;; All rights reserved. 5 ;; Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ;; 6 7 ;; This file is part of the tools applications of the Qt Toolkit. … … 21 22 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ;; 23 ;; In addition, as a special exception, Nokia gives you certain 24 ;; additional rights. These rights are described in the Nokia Qt LGPL 25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ;; package. 24 ;; In addition, as a special exception, Nokia gives you certain additional 25 ;; rights. These rights are described in the Nokia Qt LGPL Exception 26 ;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ;; 28 28 ;; GNU General Public License Usage … … 34 34 ;; met: http://www.gnu.org/copyleft/gpl.html. 35 35 ;; 36 ;; If you are unsure which license is appropriate for your use, please37 ;; contact the sales department at qt-sales@nokia.com.36 ;; If you have questions regarding the use of this file, please contact 37 ;; Nokia at qt-info@nokia.com. 38 38 ;; $QT_END_LICENSE$ 39 ;;40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.42 39 ;; 43 40 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -
trunk/tools/installer/nsis/includes/system.nsh
r2 r561 2 2 ;; 3 3 ;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ;; Contact: Qt Software Information (qt-info@nokia.com) 4 ;; All rights reserved. 5 ;; Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ;; 6 7 ;; This file is part of the tools applications of the Qt Toolkit. … … 21 22 ;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ;; 23 ;; In addition, as a special exception, Nokia gives you certain 24 ;; additional rights. These rights are described in the Nokia Qt LGPL 25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ;; package. 24 ;; In addition, as a special exception, Nokia gives you certain additional 25 ;; rights. These rights are described in the Nokia Qt LGPL Exception 26 ;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ;; 28 28 ;; GNU General Public License Usage … … 34 34 ;; met: http://www.gnu.org/copyleft/gpl.html. 35 35 ;; 36 ;; If you are unsure which license is appropriate for your use, please37 ;; contact the sales department at qt-sales@nokia.com.36 ;; If you have questions regarding the use of this file, please contact 37 ;; Nokia at qt-info@nokia.com. 38 38 ;; $QT_END_LICENSE$ 39 ;;40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.42 39 ;; 43 40 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Note:
See TracChangeset
for help on using the changeset viewer.
