summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-27 10:12:34 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-27 20:43:49 +0200
commit968437305058f3f5d55b06ed30409cdc81509a9d (patch)
tree32b6b05c599a9dde761c0bb53c35eecafc92da15
parent43b0a2677550e80277ca1e3c9439a9fa2f3d02c6 (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: I351a3815c27f51e15070f2b7bdc381f445ca058b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--src/imports/mimetypes/mimetypes.cpp5
-rw-r--r--src/imports/mimetypes/qdeclarativemimedatabase.cpp5
-rw-r--r--src/imports/mimetypes/qdeclarativemimedatabase_p.h5
-rw-r--r--src/imports/mimetypes/qdeclarativemimetype.cpp5
-rw-r--r--src/imports/mimetypes/qdeclarativemimetype_p.h5
-rw-r--r--src/mimetypes/inqt5/qstandardpaths.cpp5
-rw-r--r--src/mimetypes/inqt5/qstandardpaths.h5
-rw-r--r--src/mimetypes/inqt5/qstandardpaths_mac.cpp5
-rw-r--r--src/mimetypes/inqt5/qstandardpaths_unix.cpp5
-rw-r--r--src/mimetypes/inqt5/qstandardpaths_win.cpp5
-rw-r--r--src/mimetypes/qmime_global.h2
-rw-r--r--src/mimetypes/qmimedatabase.cpp2
-rw-r--r--src/mimetypes/qmimedatabase.h2
-rw-r--r--src/mimetypes/qmimedatabase_p.h2
-rw-r--r--src/mimetypes/qmimeglobpattern.cpp2
-rw-r--r--src/mimetypes/qmimeglobpattern_p.h2
-rw-r--r--src/mimetypes/qmimemagicrule.cpp2
-rw-r--r--src/mimetypes/qmimemagicrule_p.h2
-rw-r--r--src/mimetypes/qmimemagicrulematcher.cpp2
-rw-r--r--src/mimetypes/qmimemagicrulematcher_p.h2
-rw-r--r--src/mimetypes/qmimeprovider.cpp2
-rw-r--r--src/mimetypes/qmimeprovider_p.h2
-rw-r--r--src/mimetypes/qmimetype.cpp2
-rw-r--r--src/mimetypes/qmimetype.h2
-rw-r--r--src/mimetypes/qmimetype_p.h2
-rw-r--r--src/mimetypes/qmimetypeparser.cpp2
-rw-r--r--src/mimetypes/qmimetypeparser_p.h2
-rw-r--r--tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp5
-rw-r--r--tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml5
-rw-r--r--tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp5
-rw-r--r--tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.qml5
-rw-r--r--tests/auto/qdeclarativemimetype/tst_qdeclarativemimetypeproperties.qml5
-rw-r--r--tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp2
-rw-r--r--tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp2
-rw-r--r--tests/auto/qmimedatabase/tst_qmimedatabase.cpp2
-rw-r--r--tests/auto/qmimedatabase/tst_qmimedatabase.h2
-rw-r--r--tests/auto/qmimetype/tst_qmimetype.cpp2
-rw-r--r--tests/auto/qmimetype/tst_qmimetype.h5
38 files changed, 54 insertions, 70 deletions
diff --git a/src/imports/mimetypes/mimetypes.cpp b/src/imports/mimetypes/mimetypes.cpp
index 1c2c5e0..8499150 100644
--- a/src/imports/mimetypes/mimetypes.cpp
+++ b/src/imports/mimetypes/mimetypes.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativemimedatabase.cpp b/src/imports/mimetypes/qdeclarativemimedatabase.cpp
index 3f7b338..f7d3da0 100644
--- a/src/imports/mimetypes/qdeclarativemimedatabase.cpp
+++ b/src/imports/mimetypes/qdeclarativemimedatabase.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativemimedatabase_p.h b/src/imports/mimetypes/qdeclarativemimedatabase_p.h
index 8e14f36..9d24b47 100644
--- a/src/imports/mimetypes/qdeclarativemimedatabase_p.h
+++ b/src/imports/mimetypes/qdeclarativemimedatabase_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativemimetype.cpp b/src/imports/mimetypes/qdeclarativemimetype.cpp
index 1d841f5..323e5dd 100644
--- a/src/imports/mimetypes/qdeclarativemimetype.cpp
+++ b/src/imports/mimetypes/qdeclarativemimetype.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativemimetype_p.h b/src/imports/mimetypes/qdeclarativemimetype_p.h
index f954c56..8108501 100644
--- a/src/imports/mimetypes/qdeclarativemimetype_p.h
+++ b/src/imports/mimetypes/qdeclarativemimetype_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/inqt5/qstandardpaths.cpp b/src/mimetypes/inqt5/qstandardpaths.cpp
index 0783410..7c4da9b 100644
--- a/src/mimetypes/inqt5/qstandardpaths.cpp
+++ b/src/mimetypes/inqt5/qstandardpaths.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtGui module of the Qt Toolkit.
**
diff --git a/src/mimetypes/inqt5/qstandardpaths.h b/src/mimetypes/inqt5/qstandardpaths.h
index 217a898..02d1fbe 100644
--- a/src/mimetypes/inqt5/qstandardpaths.h
+++ b/src/mimetypes/inqt5/qstandardpaths.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtGui module of the Qt Toolkit.
**
diff --git a/src/mimetypes/inqt5/qstandardpaths_mac.cpp b/src/mimetypes/inqt5/qstandardpaths_mac.cpp
index b7a5408..6e735f7 100644
--- a/src/mimetypes/inqt5/qstandardpaths_mac.cpp
+++ b/src/mimetypes/inqt5/qstandardpaths_mac.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtGui module of the Qt Toolkit.
**
diff --git a/src/mimetypes/inqt5/qstandardpaths_unix.cpp b/src/mimetypes/inqt5/qstandardpaths_unix.cpp
index a37e529..d385390 100644
--- a/src/mimetypes/inqt5/qstandardpaths_unix.cpp
+++ b/src/mimetypes/inqt5/qstandardpaths_unix.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtGui module of the Qt Toolkit.
**
diff --git a/src/mimetypes/inqt5/qstandardpaths_win.cpp b/src/mimetypes/inqt5/qstandardpaths_win.cpp
index 68d6f0f..4e28705 100644
--- a/src/mimetypes/inqt5/qstandardpaths_win.cpp
+++ b/src/mimetypes/inqt5/qstandardpaths_win.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtGui module of the Qt Toolkit.
**
diff --git a/src/mimetypes/qmime_global.h b/src/mimetypes/qmime_global.h
index b315215..37f7040 100644
--- a/src/mimetypes/qmime_global.h
+++ b/src/mimetypes/qmime_global.h
@@ -4,7 +4,7 @@
**
** Based on Qt Creator source code
**
-** Qt Creator Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Qt Creator Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
**
**
** GNU Lesser General Public License Usage
diff --git a/src/mimetypes/qmimedatabase.cpp b/src/mimetypes/qmimedatabase.cpp
index 631de0a..960fc7c 100644
--- a/src/mimetypes/qmimedatabase.cpp
+++ b/src/mimetypes/qmimedatabase.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimedatabase.h b/src/mimetypes/qmimedatabase.h
index 11c60ad..13932ac 100644
--- a/src/mimetypes/qmimedatabase.h
+++ b/src/mimetypes/qmimedatabase.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimedatabase_p.h b/src/mimetypes/qmimedatabase_p.h
index de32a79..e178470 100644
--- a/src/mimetypes/qmimedatabase_p.h
+++ b/src/mimetypes/qmimedatabase_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimeglobpattern.cpp b/src/mimetypes/qmimeglobpattern.cpp
index 1e872f2..4c29bd0 100644
--- a/src/mimetypes/qmimeglobpattern.cpp
+++ b/src/mimetypes/qmimeglobpattern.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimeglobpattern_p.h b/src/mimetypes/qmimeglobpattern_p.h
index 34c255e..e983282 100644
--- a/src/mimetypes/qmimeglobpattern_p.h
+++ b/src/mimetypes/qmimeglobpattern_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimemagicrule.cpp b/src/mimetypes/qmimemagicrule.cpp
index 428100b..30b607f 100644
--- a/src/mimetypes/qmimemagicrule.cpp
+++ b/src/mimetypes/qmimemagicrule.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimemagicrule_p.h b/src/mimetypes/qmimemagicrule_p.h
index 68a6848..ca84d08 100644
--- a/src/mimetypes/qmimemagicrule_p.h
+++ b/src/mimetypes/qmimemagicrule_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimemagicrulematcher.cpp b/src/mimetypes/qmimemagicrulematcher.cpp
index e2c46ea..0d587a3 100644
--- a/src/mimetypes/qmimemagicrulematcher.cpp
+++ b/src/mimetypes/qmimemagicrulematcher.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimemagicrulematcher_p.h b/src/mimetypes/qmimemagicrulematcher_p.h
index 3e8eb6f..b36f8fb 100644
--- a/src/mimetypes/qmimemagicrulematcher_p.h
+++ b/src/mimetypes/qmimemagicrulematcher_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimeprovider.cpp b/src/mimetypes/qmimeprovider.cpp
index 907285b..013172b 100644
--- a/src/mimetypes/qmimeprovider.cpp
+++ b/src/mimetypes/qmimeprovider.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimeprovider_p.h b/src/mimetypes/qmimeprovider_p.h
index 89b5d40..194ac7b 100644
--- a/src/mimetypes/qmimeprovider_p.h
+++ b/src/mimetypes/qmimeprovider_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimetype.cpp b/src/mimetypes/qmimetype.cpp
index e762ebc..0511d8b 100644
--- a/src/mimetypes/qmimetype.cpp
+++ b/src/mimetypes/qmimetype.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimetype.h b/src/mimetypes/qmimetype.h
index d55a6b1..3e45ec7 100644
--- a/src/mimetypes/qmimetype.h
+++ b/src/mimetypes/qmimetype.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimetype_p.h b/src/mimetypes/qmimetype_p.h
index 1dc7b81..9cea5d6 100644
--- a/src/mimetypes/qmimetype_p.h
+++ b/src/mimetypes/qmimetype_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimetypeparser.cpp b/src/mimetypes/qmimetypeparser.cpp
index ba265e2..d205ecd 100644
--- a/src/mimetypes/qmimetypeparser.cpp
+++ b/src/mimetypes/qmimetypeparser.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/src/mimetypes/qmimetypeparser_p.h b/src/mimetypes/qmimetypeparser_p.h
index 1d5ce90..42352f1 100644
--- a/src/mimetypes/qmimetypeparser_p.h
+++ b/src/mimetypes/qmimetypeparser_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
diff --git a/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp b/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp
index 0c43123..814a63a 100644
--- a/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp
+++ b/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml b/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml
index f658dcb..b33c19a 100644
--- a/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml
+++ b/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp b/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp
index 0c43123..814a63a 100644
--- a/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp
+++ b/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.qml b/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.qml
index 1108ede..df50232 100644
--- a/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.qml
+++ b/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetype.qml
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetypeproperties.qml b/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetypeproperties.qml
index 1f37daa..e6d2655 100644
--- a/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetypeproperties.qml
+++ b/tests/auto/qdeclarativemimetype/tst_qdeclarativemimetypeproperties.qml
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp b/tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp
index 8043aa4..28b2470 100644
--- a/tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp
+++ b/tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the test suite of the Qt Toolkit.
diff --git a/tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp b/tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp
index 2206849..4585843 100644
--- a/tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp
+++ b/tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the test suite of the Qt Toolkit.
diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
index 13cba2b..2de1e89 100644
--- a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the test suite of the Qt Toolkit.
diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.h b/tests/auto/qmimedatabase/tst_qmimedatabase.h
index c7d11f3..017eb2b 100644
--- a/tests/auto/qmimedatabase/tst_qmimedatabase.h
+++ b/tests/auto/qmimedatabase/tst_qmimedatabase.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the test suite of the Qt Toolkit.
diff --git a/tests/auto/qmimetype/tst_qmimetype.cpp b/tests/auto/qmimetype/tst_qmimetype.cpp
index fb6fe3c..a6f4cda 100644
--- a/tests/auto/qmimetype/tst_qmimetype.cpp
+++ b/tests/auto/qmimetype/tst_qmimetype.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the test suite of the Qt Toolkit.
diff --git a/tests/auto/qmimetype/tst_qmimetype.h b/tests/auto/qmimetype/tst_qmimetype.h
index 835cacb..f46f2a3 100644
--- a/tests/auto/qmimetype/tst_qmimetype.h
+++ b/tests/auto/qmimetype/tst_qmimetype.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 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 QtMimeTypes addon of the Qt Toolkit.
**