diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-15 14:57:40 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-19 15:57:01 +0000 |
| commit | 397e7f48437dc57e6333c3a358ad24d3e891920d (patch) | |
| tree | 66dad73e3a9764e1c5dae2106eac127a81673460 /src/plugins/cppeditor/CppEditor.json.in | |
| parent | 1b4321279fccb458882ed0f581ce7834fd1529fa (diff) | |
Update License according to agreement with Free Qt Foundation
* Update files in src/plugins
Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/cppeditor/CppEditor.json.in')
| -rw-r--r-- | src/plugins/cppeditor/CppEditor.json.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cppeditor/CppEditor.json.in b/src/plugins/cppeditor/CppEditor.json.in index 63523c35df..2f988febb2 100644 --- a/src/plugins/cppeditor/CppEditor.json.in +++ b/src/plugins/cppeditor/CppEditor.json.in @@ -3,14 +3,14 @@ \"Version\" : \"$$QTCREATOR_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", \"Vendor\" : \"The Qt Company Ltd\", - \"Copyright\" : \"(C) 2015 The Qt Company Ltd\", + \"Copyright\" : \"(C) 2016 The Qt Company Ltd\", \"License\" : [ \"Commercial Usage\", \"\", \"Licensees holding valid Qt Commercial licenses may use this plugin 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 The Qt Company.\", \"\", - \"GNU Lesser General Public License Usage\", + \"GNU General Public License Usage\", \"\", - \"Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 or version 3 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License requirements will be met: https://www.gnu.org/licenses/lgpl.html and http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\" + \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\" ], \"Category\" : \"C++\", \"Description\" : \"C/C++ editor component.\", |