diff options
author | Marco Bubke <marco.bubke@nokia.com> | 2011-07-11 18:17:51 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-07-12 13:58:57 +0200 |
commit | c02f1fb78a912bb6a5d50dfe80c8c9fc020de481 (patch) | |
tree | 9a03a1545bf3a8de00d0fb893cecadf2b54eac4a | |
parent | 878b24430925631bda1ccb7cca4b8eae1fe795a7 (diff) |
QmlDesigner: Fix license header
Change-Id: I4a8e1abd5a5b2431f654bb64421c872655b3ce40
Reviewed-on: http://codereview.qt.nokia.com/1458
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.cpp | 72 | ||||
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.h | 72 |
2 files changed, 42 insertions, 102 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.cpp index 7eac1c3a9b7..5cec028db29 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.cpp @@ -1,67 +1,37 @@ /************************************************************************** - ** - -** This file is part of Qt Creator - +** This file is part of Qt Creator ** - -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). - +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** - -** Contact: Nokia Corporation (info@nokia.com) - +** 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 ** - -** GNU Lesser General Public License Usage - +** 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. ** - -** 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. - +** 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. ** - -** 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. - +** Other Usage ** - -** If you have questions regarding the use of this file, please contact - -** Nokia at info@nokia.com. - +** 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. ** - **************************************************************************/ + + #include "anchorchangesnodeinstance.h" namespace QmlDesigner { diff --git a/share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.h index 0efb1d97b2a..f4f0a959890 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.h @@ -1,67 +1,37 @@ /************************************************************************** - ** - -** This file is part of Qt Creator - +** This file is part of Qt Creator ** - -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). - +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** - -** Contact: Nokia Corporation (qt-info@nokia.com) - +** 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 ** - -** GNU Lesser General Public License Usage - +** 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. ** - -** 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. - +** 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. ** - -** 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. - +** Other Usage ** - -** If you have questions regarding the use of this file, please contact - -** Nokia at info@nokia.com. - +** 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. ** - **************************************************************************/ + + #ifndef QMLDESIGNER_ANCHORCHANGESNODEINSTANCE_H #define QMLDESIGNER_ANCHORCHANGESNODEINSTANCE_H |