summaryrefslogtreecommitdiffstats
path: root/tools/installer/nsis/includes/qtcommon.nsh
diff options
context:
space:
mode:
Diffstat (limited to 'tools/installer/nsis/includes/qtcommon.nsh')
-rw-r--r--tools/installer/nsis/includes/qtcommon.nsh26
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index 3a91e07..c166fcd 100644
--- a/tools/installer/nsis/includes/qtcommon.nsh
+++ b/tools/installer/nsis/includes/qtcommon.nsh
@@ -7,11 +7,11 @@
;; This file is part of the tools applications of the Qt Toolkit.
;;
;; $QT_BEGIN_LICENSE:LGPL$
-;; 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 Technology Preview License Agreement accompanying
-;; this package.
+;; Commercial Usage
+;; Licensees holding valid Qt Commercial licenses may use this file in
+;; accordance with the Qt Commercial License Agreement provided with the
+;; Software or, alternatively, in accordance with the terms contained in
+;; a written agreement between you and Nokia.
;;
;; GNU Lesser General Public License Usage
;; Alternatively, this file may be used under the terms of the GNU Lesser
@@ -25,16 +25,16 @@
;; 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.
-;;
-;;
-;;
-;;
-;;
-;;
-;;
-;;
;; $QT_END_LICENSE$
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;