forked from qt-creator/qt-creator
Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
Eike Ziller
@@ -2,171 +2,6 @@ diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g
|
||||
index 069be3c..9cbdc23 100644
|
||||
--- a/src/libs/qmljs/parser/qmljs.g
|
||||
+++ b/src/libs/qmljs/parser/qmljs.g
|
||||
@@ -1,23 +1,30 @@
|
||||
----------------------------------------------------------------------------
|
||||
--
|
||||
--- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
+-- This file is part of Qt Creator
|
||||
+--
|
||||
+-- Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
+--
|
||||
-- Contact: http://www.qt-project.org/
|
||||
--
|
||||
--- This file is part of the QtQml module of the Qt Toolkit.
|
||||
--
|
||||
--- $QT_BEGIN_LICENSE:LGPL-ONLY$
|
||||
-- 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.
|
||||
--
|
||||
--- If you have questions regarding the use of this file, please contact
|
||||
--- us via http://www.qt-project.org/.
|
||||
+-- 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.
|
||||
+--
|
||||
+-- 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.
|
||||
--
|
||||
--- $QT_END_LICENSE$
|
||||
--
|
||||
----------------------------------------------------------------------------
|
||||
|
||||
@@ -83,46 +90,36 @@
|
||||
|
||||
%start TopLevel
|
||||
|
||||
-/./****************************************************************************
|
||||
+/./**************************************************************************
|
||||
+**
|
||||
+** This file is part of Qt Creator
|
||||
+**
|
||||
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
**
|
||||
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
-** This file is part of the QtQml module of the Qt Toolkit.
|
||||
**
|
||||
-** $QT_BEGIN_LICENSE:LGPL$
|
||||
** 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:
|
||||
+** 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.
|
||||
**
|
||||
-** GNU General Public License Usage
|
||||
-** Alternatively, this file may be used under the terms of the GNU General
|
||||
-** Public License version 3.0 as published by the Free Software Foundation
|
||||
-** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
-** file. Please review the following information to ensure the GNU General
|
||||
-** Public License version 3.0 requirements will be met:
|
||||
-** http://www.gnu.org/copyleft/gpl.html.
|
||||
-**
|
||||
** 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.
|
||||
**
|
||||
**
|
||||
-**
|
||||
-**
|
||||
-**
|
||||
-**
|
||||
-** $QT_END_LICENSE$
|
||||
-**
|
||||
-****************************************************************************/
|
||||
+**************************************************************************/
|
||||
+
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QCoreApplication>
|
||||
@@ -136,46 +133,36 @@
|
||||
|
||||
./
|
||||
|
||||
-/:/****************************************************************************
|
||||
+/:/**************************************************************************
|
||||
+**
|
||||
+** This file is part of Qt Creator
|
||||
+**
|
||||
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
**
|
||||
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
-** This file is part of the QtQml module of the Qt Toolkit.
|
||||
**
|
||||
-** $QT_BEGIN_LICENSE:LGPL$
|
||||
** 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:
|
||||
+** 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.
|
||||
**
|
||||
-** GNU General Public License Usage
|
||||
-** Alternatively, this file may be used under the terms of the GNU General
|
||||
-** Public License version 3.0 as published by the Free Software Foundation
|
||||
-** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
-** file. Please review the following information to ensure the GNU General
|
||||
-** Public License version 3.0 requirements will be met:
|
||||
-** http://www.gnu.org/copyleft/gpl.html.
|
||||
-**
|
||||
** 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.
|
||||
**
|
||||
**
|
||||
-**
|
||||
-**
|
||||
-**
|
||||
-**
|
||||
-** $QT_END_LICENSE$
|
||||
-**
|
||||
-****************************************************************************/
|
||||
+**************************************************************************/
|
||||
+
|
||||
|
||||
|
||||
//
|
||||
diff --git b/src/libs/qmljs/parser/qmljsengine_p.cpp a/src/libs/qmljs/parser/qmljsengine_p.cpp
|
||||
index 5b204c9..10e39ab 100644
|
||||
--- b/src/libs/qmljs/parser/qmljsengine_p.cpp
|
||||
+++ a/src/libs/qmljs/parser/qmljsengine_p.cpp
|
||||
@@ -111,7 +111,7 @@ double integerFromString(const QString &str, int radix)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user