aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-27 12:18:57 +0300
committerTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-28 09:29:50 +0200
commit188e960e496ad31839ab879e139c4f1cf9f10656 (patch)
tree2a2fb6648c712004a80d854c3041a0520493030f /tests
parentfa2e571b6c68aa9439a88fc7ab441b6e091268df (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.*' {} \; | tee >(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{ 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.*|.*http:\/\/www\.qt-project\.org\/.*)/ \1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs sed -i -r '1,50{/(^[ \t:#*]*)(all rights reserved.*)/Id}') Command now finds command details that point to qt-project.org and changes them to qt-project.org/legal Also no longer wrongly replaces code snippet "copyright = ..". Need to fix these case-by-case later. Change-Id: I4456c00202c4a2264a400bdc18c19cd097876861 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/QtDeclarative/bug_456.qml3
-rw-r--r--tests/QtDeclarative/bug_726.qml3
-rw-r--r--tests/QtDeclarative/hw.qml5
-rw-r--r--tests/QtDeclarative/view.qml5
-rw-r--r--tests/QtGui/bug_696.py2
-rw-r--r--tests/pysidetest/hiddenobject.cpp2
-rw-r--r--tests/pysidetest/hiddenobject.h2
-rw-r--r--tests/pysidetest/testobject.cpp2
-rw-r--r--tests/pysidetest/testobject.h2
-rwxr-xr-xtests/tools/list-class-hierarchy.py2
-rw-r--r--tests/util/py3kcompat.py2
11 files changed, 13 insertions, 17 deletions
diff --git a/tests/QtDeclarative/bug_456.qml b/tests/QtDeclarative/bug_456.qml
index 960972a61..3b7e15379 100644
--- a/tests/QtDeclarative/bug_456.qml
+++ b/tests/QtDeclarative/bug_456.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: PySide Team (pyside@openbossa.org)
**
** This file is part of the examples of PySide: Python for Qt.
diff --git a/tests/QtDeclarative/bug_726.qml b/tests/QtDeclarative/bug_726.qml
index dba3fcdfe..1e2cade3f 100644
--- a/tests/QtDeclarative/bug_726.qml
+++ b/tests/QtDeclarative/bug_726.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: PySide Team (pyside@openbossa.org)
**
** This file is part of the examples of PySide: Python for Qt.
diff --git a/tests/QtDeclarative/hw.qml b/tests/QtDeclarative/hw.qml
index f97531578..2b95b6471 100644
--- a/tests/QtDeclarative/hw.qml
+++ b/tests/QtDeclarative/hw.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/QtDeclarative/view.qml b/tests/QtDeclarative/view.qml
index 5d23606b3..c85179819 100644
--- a/tests/QtDeclarative/view.qml
+++ b/tests/QtDeclarative/view.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/QtGui/bug_696.py b/tests/QtGui/bug_696.py
index ff62e7abe..f1f6ac0c1 100644
--- a/tests/QtGui/bug_696.py
+++ b/tests/QtGui/bug_696.py
@@ -3,7 +3,7 @@
#
# This file is part of the Shiboken Python Bindings Generator project.
#
-# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
#
# Contact: PySide team <contact@pyside.org>
#
diff --git a/tests/pysidetest/hiddenobject.cpp b/tests/pysidetest/hiddenobject.cpp
index 00c7bed6e..dedc97aaa 100644
--- a/tests/pysidetest/hiddenobject.cpp
+++ b/tests/pysidetest/hiddenobject.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of the PySide project.
*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*
* Contact: PySide team <contact@pyside.org>
*
diff --git a/tests/pysidetest/hiddenobject.h b/tests/pysidetest/hiddenobject.h
index eb02d142d..744d966ff 100644
--- a/tests/pysidetest/hiddenobject.h
+++ b/tests/pysidetest/hiddenobject.h
@@ -1,7 +1,7 @@
/*
* This file is part of the PySide project.
*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*
* Contact: PySide team <contact@pyside.org>
*
diff --git a/tests/pysidetest/testobject.cpp b/tests/pysidetest/testobject.cpp
index 098890110..4753f8b8f 100644
--- a/tests/pysidetest/testobject.cpp
+++ b/tests/pysidetest/testobject.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of the PySide project.
*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*
* Contact: PySide team <contact@pyside.org>
*
diff --git a/tests/pysidetest/testobject.h b/tests/pysidetest/testobject.h
index 71e37163c..21db774d2 100644
--- a/tests/pysidetest/testobject.h
+++ b/tests/pysidetest/testobject.h
@@ -1,7 +1,7 @@
/*
* This file is part of the PySide project.
*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*
* Contact: PySide team <contact@pyside.org>
*
diff --git a/tests/tools/list-class-hierarchy.py b/tests/tools/list-class-hierarchy.py
index a4faf60ab..25f1ae96c 100755
--- a/tests/tools/list-class-hierarchy.py
+++ b/tests/tools/list-class-hierarchy.py
@@ -2,7 +2,7 @@
# This file is part of PySide: Python for Qt
#
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
#
# Contact: PySide team <contact@pyside.org>
#
diff --git a/tests/util/py3kcompat.py b/tests/util/py3kcompat.py
index bf1129040..d221e4655 100644
--- a/tests/util/py3kcompat.py
+++ b/tests/util/py3kcompat.py
@@ -2,7 +2,7 @@
#
# This file is part of the Shiboken Python Bindings Generator project.
#
-# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
#
# Contact: PySide team <contact@pyside.org>
#