diff options
| author | Thomas Murach <thomas.murach@ovi.com> | 2011-07-06 15:48:52 +0000 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-07-06 17:56:15 +0200 |
| commit | a4c4d67772cf243e9f694e78129bf9a24d0304b0 (patch) | |
| tree | c2f777f740af1d12a00d7d0db675d4cbc64df3f1 /src/plugins/qmlprofiler/qmlprofilerengine.cpp | |
| parent | 5b0fc95354140c714b6933a811a6561b69d4bcda (diff) | |
| download | qt-creator-a4c4d67772cf243e9f694e78129bf9a24d0304b0.tar.gz | |
corrected license headers
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerengine.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerengine.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index d62582232b..27f34056ff 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -6,26 +6,25 @@ ** ** Contact: Nokia Corporation (info@qt.nokia.com) ** -** 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. ** ** GNU Lesser General Public License Usage ** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** 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. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to 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. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** +** Other Usage +** +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** ** If you have questions regarding the use of this file, please contact ** Nokia at info@qt.nokia.com. ** |