summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/toolsettings.h
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2011-02-21 14:57:44 +0100
committercon <qtc-committer@nokia.com>2011-02-21 14:58:21 +0100
commit53985dbf58de17e41b1b9f353a190365841ad5e4 (patch)
tree7c7a2f2a942c79b5a1bc6f00aaf00436eec2c98e /src/plugins/coreplugin/toolsettings.h
parent3b707461dac9af02d203d847e6e90d9fdec38d27 (diff)
downloadqt-creator-53985dbf58de17e41b1b9f353a190365841ad5e4.tar.gz
License update.
Diffstat (limited to 'src/plugins/coreplugin/toolsettings.h')
-rw-r--r--src/plugins/coreplugin/toolsettings.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/plugins/coreplugin/toolsettings.h b/src/plugins/coreplugin/toolsettings.h
index 5d19a6057f..682047944a 100644
--- a/src/plugins/coreplugin/toolsettings.h
+++ b/src/plugins/coreplugin/toolsettings.h
@@ -2,16 +2,16 @@
**
** This file is part of Qt Creator
**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** Commercial Usage
+** No 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.
+** 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.
**
** GNU Lesser General Public License Usage
**
@@ -22,8 +22,12 @@
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
+** In addition, as a special exception, Nokia gives you certain 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
**
**************************************************************************/