summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-09-02 09:07:57 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-09-02 09:07:57 (GMT)
commitf21518960ba0c4a21e89c9fddb7310e5ba96fea5 (patch)
tree9a9b955ca155eba4f04da98caa2fa436bce750e3 /util
parent99655d5cd5b7543377d9c56ba953b07946ccbf74 (diff)
downloadQt-f21518960ba0c4a21e89c9fddb7310e5ba96fea5.zip
Qt-f21518960ba0c4a21e89c9fddb7310e5ba96fea5.tar.gz
Qt-f21518960ba0c4a21e89c9fddb7310e5ba96fea5.tar.bz2
Update license text.
Reviewed-by: Trust Me
Diffstat (limited to 'util')
-rwxr-xr-xutil/scripts/make_qfeatures_dot_h26
1 files changed, 13 insertions, 13 deletions
diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h
index 95fbec1..d925d15 100755
--- a/util/scripts/make_qfeatures_dot_h
+++ b/util/scripts/make_qfeatures_dot_h
@@ -94,8 +94,8 @@ print OUT
** 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
@@ -106,20 +106,20 @@ print OUT
** 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\$
**
****************************************************************************/