diff options
author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-27 10:59:08 +0300 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-28 14:01:58 +0200 |
commit | 87b7bc2826de14eb8029d29c92db5c87f778c33e (patch) | |
tree | f515cb826007a28b7092edd8fe3301e1bac991ef /tests | |
parent | 1bd82349f0b8eef67e04f9592ae2bae954683968 (diff) |
Replaced Nokia copyrights and contact details
Replaced Nokia copyrights with correct Digia copyrights.
Text in front of copyright is now retained:
** File is part of Foo, Copyright Nokia... ->
** File is part of Foo, Copyright Digia...
Replaced Nokia contact details with Digia's.
Removing "All Rights Reserved" no longer leaves an empty line.
Used the following command:
find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E
'.*Copyright.*Nokia.*|.*Contact.*Nokia.*' {} \; |
tee >(xargs sed -i -r
'1,50 { /INdT/ !{ s/(^[ \t:#*]*)([a-z ]*)(Copyright.*Nokia.*)/
\1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I }
}') >(xargs sed -i -r '1,50 s/(^[ \t:#*]*)(.*info@qt\.nokia\.com.*
|.*INSERT EMAIL ADDRESS.*|.*qt-info@nokia\.com.*
|.*qt-label1@nokia\.com.*|.*http:\/\/qt\.nokia\.com\/contact.*
|.*qt-sales@nokia\.com.*)
/\1Contact: http:\/\/www\.qt-project\.org\/legal/I')
>(xargs sed -i -r '1,50{/(^[ \t:#*]*)(all rights reserved.*)/Id}')
Change-Id: I09634a31c17fc328d04265bd87e7f4a5ef795760
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/qmlauto/buttonclick/Button.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/buttonclick/tst_buttonclick.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/createbenchmark/item.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/createbenchmark/tst_createbenchmark.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/events/tst_events.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/qdecarativebinding/tst_binding.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/qdecarativebinding/tst_binding2.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/qdecarativeborderimage/InvalidSciFile.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/qdecarativeborderimage/tst_borderimage.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/selftests/tst_compare.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/selftests/tst_compare_quickobjects.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/selftests/tst_selftests.qml | 5 | ||||
-rw-r--r-- | tests/qmlauto/tst_qmlauto.cpp | 5 | ||||
-rw-r--r-- | tests/qmlexample/tst_basic.qml | 5 | ||||
-rw-r--r-- | tests/qmlexample/tst_item.qml | 5 | ||||
-rw-r--r-- | tests/qmlexample/tst_qmlexample.cpp | 5 |
16 files changed, 32 insertions, 48 deletions
diff --git a/tests/qmlauto/buttonclick/Button.qml b/tests/qmlauto/buttonclick/Button.qml index f600f87..97e5c42 100644 --- a/tests/qmlauto/buttonclick/Button.qml +++ b/tests/qmlauto/buttonclick/Button.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/buttonclick/tst_buttonclick.qml b/tests/qmlauto/buttonclick/tst_buttonclick.qml index d3c1e8a..accb325 100644 --- a/tests/qmlauto/buttonclick/tst_buttonclick.qml +++ b/tests/qmlauto/buttonclick/tst_buttonclick.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/createbenchmark/item.qml b/tests/qmlauto/createbenchmark/item.qml index 0e9df69..8063b6f 100644 --- a/tests/qmlauto/createbenchmark/item.qml +++ b/tests/qmlauto/createbenchmark/item.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** diff --git a/tests/qmlauto/createbenchmark/tst_createbenchmark.qml b/tests/qmlauto/createbenchmark/tst_createbenchmark.qml index 840437f..a54623c 100644 --- a/tests/qmlauto/createbenchmark/tst_createbenchmark.qml +++ b/tests/qmlauto/createbenchmark/tst_createbenchmark.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/events/tst_events.qml b/tests/qmlauto/events/tst_events.qml index 1b86d47..ae9ab83 100644 --- a/tests/qmlauto/events/tst_events.qml +++ b/tests/qmlauto/events/tst_events.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/qdecarativebinding/tst_binding.qml b/tests/qmlauto/qdecarativebinding/tst_binding.qml index 2312102..83c3da8 100644 --- a/tests/qmlauto/qdecarativebinding/tst_binding.qml +++ b/tests/qmlauto/qdecarativebinding/tst_binding.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/qdecarativebinding/tst_binding2.qml b/tests/qmlauto/qdecarativebinding/tst_binding2.qml index 31ea52c..caae22b 100644 --- a/tests/qmlauto/qdecarativebinding/tst_binding2.qml +++ b/tests/qmlauto/qdecarativebinding/tst_binding2.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/qdecarativeborderimage/InvalidSciFile.qml b/tests/qmlauto/qdecarativeborderimage/InvalidSciFile.qml index c9537fa..9838aa7 100644 --- a/tests/qmlauto/qdecarativeborderimage/InvalidSciFile.qml +++ b/tests/qmlauto/qdecarativeborderimage/InvalidSciFile.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/qdecarativeborderimage/tst_borderimage.qml b/tests/qmlauto/qdecarativeborderimage/tst_borderimage.qml index b784f17..7206f8b 100644 --- a/tests/qmlauto/qdecarativeborderimage/tst_borderimage.qml +++ b/tests/qmlauto/qdecarativeborderimage/tst_borderimage.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/selftests/tst_compare.qml b/tests/qmlauto/selftests/tst_compare.qml index f79b447..3c47bff 100644 --- a/tests/qmlauto/selftests/tst_compare.qml +++ b/tests/qmlauto/selftests/tst_compare.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/selftests/tst_compare_quickobjects.qml b/tests/qmlauto/selftests/tst_compare_quickobjects.qml index a0b35d4..24c048b 100644 --- a/tests/qmlauto/selftests/tst_compare_quickobjects.qml +++ b/tests/qmlauto/selftests/tst_compare_quickobjects.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/selftests/tst_selftests.qml b/tests/qmlauto/selftests/tst_selftests.qml index 60e7a59..b0a54c1 100644 --- a/tests/qmlauto/selftests/tst_selftests.qml +++ b/tests/qmlauto/selftests/tst_selftests.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlauto/tst_qmlauto.cpp b/tests/qmlauto/tst_qmlauto.cpp index 4d18ccd..41bb1c5 100644 --- a/tests/qmlauto/tst_qmlauto.cpp +++ b/tests/qmlauto/tst_qmlauto.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlexample/tst_basic.qml b/tests/qmlexample/tst_basic.qml index 2d703c5..8609f3a 100644 --- a/tests/qmlexample/tst_basic.qml +++ b/tests/qmlexample/tst_basic.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlexample/tst_item.qml b/tests/qmlexample/tst_item.qml index 80f252b..df38470 100644 --- a/tests/qmlexample/tst_item.qml +++ b/tests/qmlexample/tst_item.qml @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/qmlexample/tst_qmlexample.cpp b/tests/qmlexample/tst_qmlexample.cpp index 9546832..0da1a0b 100644 --- a/tests/qmlexample/tst_qmlexample.cpp +++ b/tests/qmlexample/tst_qmlexample.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** |