summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2010-12-17 17:14:20 +0100
committercon <qtc-committer@nokia.com>2010-12-17 17:14:20 +0100
commit23c22b7c66d818e3aa5ae537ce6e365b421b5801 (patch)
treec2cc9509e284c581d9b9a19c6b614deb2af059bf /src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp
parent73b813fd161781d2a70779e8d487f75d05227c4a (diff)
downloadqt-creator-23c22b7c66d818e3aa5ae537ce6e365b421b5801.tar.gz
License headers, part 2
Diffstat (limited to 'src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp')
-rw-r--r--src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp b/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp
index a333e201db..cd786d627b 100644
--- a/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp
+++ b/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp
@@ -6,12 +6,12 @@
**
** 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.
**
**************************************************************************/