diff options
Diffstat (limited to 'src/libs/qmljs/parser')
22 files changed, 26 insertions, 78 deletions
diff --git a/src/libs/qmljs/parser/parser.patch b/src/libs/qmljs/parser/parser.patch index d15753bc58..755aa27a93 100644 --- a/src/libs/qmljs/parser/parser.patch +++ b/src/libs/qmljs/parser/parser.patch @@ -11,7 +11,7 @@ index 6888b65..784e47f 100644 +-- +-- Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +-- - -- Contact: Nokia Corporation (qt-info@nokia.com) + -- Contact: http://www.qt-project.org/ -- --- This file is part of the QtDeclarative module of the Qt Toolkit. -- @@ -40,8 +40,6 @@ index 6888b65..784e47f 100644 +-- 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 qt-info@nokia.com. --- $QT_END_LICENSE$ -- ---------------------------------------------------------------------------- @@ -59,7 +57,7 @@ index 6888b65..784e47f 100644 ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) + ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. ** @@ -93,8 +91,6 @@ index 6888b65..784e47f 100644 ** 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 qt-info@nokia.com. ** -** -** @@ -119,7 +115,7 @@ index 6888b65..784e47f 100644 ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) + ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. ** @@ -153,8 +149,6 @@ index 6888b65..784e47f 100644 ** 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 qt-info@nokia.com. ** -** -** diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp index 25249899bf..7324abe785 100644 --- a/src/libs/qmljs/parser/qmldirparser.cpp +++ b/src/libs/qmljs/parser/qmldirparser.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmldirparser_p.h b/src/libs/qmljs/parser/qmldirparser_p.h index 21266aaf9e..ca8dd57df7 100644 --- a/src/libs/qmljs/parser/qmldirparser_p.h +++ b/src/libs/qmljs/parser/qmldirparser_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp index a126609412..b3408f7166 100644 --- a/src/libs/qmljs/parser/qmlerror.cpp +++ b/src/libs/qmljs/parser/qmlerror.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmlerror.h b/src/libs/qmljs/parser/qmlerror.h index 5839152f8b..e5394dfa71 100644 --- a/src/libs/qmljs/parser/qmlerror.h +++ b/src/libs/qmljs/parser/qmlerror.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g index 8720c78d86..e8c7b8cf20 100644 --- a/src/libs/qmljs/parser/qmljs.g +++ b/src/libs/qmljs/parser/qmljs.g @@ -4,7 +4,7 @@ -- -- Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -- --- Contact: Nokia Corporation (qt-info@nokia.com) +-- Contact: http://www.qt-project.org/ -- -- -- GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ -- 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 qt-info@nokia.com. -- ---------------------------------------------------------------------------- @@ -98,7 +96,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -119,8 +117,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ @@ -142,7 +138,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -163,8 +159,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsast.cpp b/src/libs/qmljs/parser/qmljsast.cpp index 461a570312..cbb2ce2973 100644 --- a/src/libs/qmljs/parser/qmljsast.cpp +++ b/src/libs/qmljs/parser/qmljsast.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h index 75a54994f3..0fd68ae5b5 100644 --- a/src/libs/qmljs/parser/qmljsast_p.h +++ b/src/libs/qmljs/parser/qmljsast_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsastfwd_p.h b/src/libs/qmljs/parser/qmljsastfwd_p.h index 6854595762..10fc2534bb 100644 --- a/src/libs/qmljs/parser/qmljsastfwd_p.h +++ b/src/libs/qmljs/parser/qmljsastfwd_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsastvisitor.cpp b/src/libs/qmljs/parser/qmljsastvisitor.cpp index b31f0cc8ce..4a1bc8a6df 100644 --- a/src/libs/qmljs/parser/qmljsastvisitor.cpp +++ b/src/libs/qmljs/parser/qmljsastvisitor.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsastvisitor_p.h b/src/libs/qmljs/parser/qmljsastvisitor_p.h index 02c083c1e5..9502e681bc 100644 --- a/src/libs/qmljs/parser/qmljsastvisitor_p.h +++ b/src/libs/qmljs/parser/qmljsastvisitor_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsengine_p.cpp b/src/libs/qmljs/parser/qmljsengine_p.cpp index 53fa6e4805..780cb38bd9 100644 --- a/src/libs/qmljs/parser/qmljsengine_p.cpp +++ b/src/libs/qmljs/parser/qmljsengine_p.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsengine_p.h b/src/libs/qmljs/parser/qmljsengine_p.h index 85cdc20d5d..e5d78147e4 100644 --- a/src/libs/qmljs/parser/qmljsengine_p.h +++ b/src/libs/qmljs/parser/qmljsengine_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsglobal_p.h b/src/libs/qmljs/parser/qmljsglobal_p.h index 5d9c5b0191..56fbc3f716 100644 --- a/src/libs/qmljs/parser/qmljsglobal_p.h +++ b/src/libs/qmljs/parser/qmljsglobal_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ #ifndef QMLJSGLOBAL_P_H diff --git a/src/libs/qmljs/parser/qmljsgrammar.cpp b/src/libs/qmljs/parser/qmljsgrammar.cpp index 4b6d9e10f1..fd0c78f0a6 100644 --- a/src/libs/qmljs/parser/qmljsgrammar.cpp +++ b/src/libs/qmljs/parser/qmljsgrammar.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h index 0c675e847b..0ef10463e4 100644 --- a/src/libs/qmljs/parser/qmljsgrammar_p.h +++ b/src/libs/qmljs/parser/qmljsgrammar_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljskeywords_p.h b/src/libs/qmljs/parser/qmljskeywords_p.h index 696cee5154..043a6f2981 100644 --- a/src/libs/qmljs/parser/qmljskeywords_p.h +++ b/src/libs/qmljs/parser/qmljskeywords_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index 8b481bcb3f..b868a84bcc 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/src/libs/qmljs/parser/qmljslexer.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljslexer_p.h b/src/libs/qmljs/parser/qmljslexer_p.h index 27e7ac1208..cefa538bf5 100644 --- a/src/libs/qmljs/parser/qmljslexer_p.h +++ b/src/libs/qmljs/parser/qmljslexer_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsmemorypool_p.h b/src/libs/qmljs/parser/qmljsmemorypool_p.h index 2cb7d036c5..0f3e46b186 100644 --- a/src/libs/qmljs/parser/qmljsmemorypool_p.h +++ b/src/libs/qmljs/parser/qmljsmemorypool_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp index b147a6eed8..9895b21df6 100644 --- a/src/libs/qmljs/parser/qmljsparser.cpp +++ b/src/libs/qmljs/parser/qmljsparser.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/libs/qmljs/parser/qmljsparser_p.h b/src/libs/qmljs/parser/qmljsparser_p.h index 1e52432831..f68eb5d03e 100644 --- a/src/libs/qmljs/parser/qmljsparser_p.h +++ b/src/libs/qmljs/parser/qmljsparser_p.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** ** GNU Lesser General Public License Usage @@ -25,8 +25,6 @@ ** 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 qt-info@nokia.com. ** **************************************************************************/ |